Shader module cleanups