more cleanup around loading shaders