Shader: Cleaning up library/generic shaders