Shader cleanups