Remove some dead and non-thread safe internal uniforms