Removed singleton stuff from Shader class