Continued cleanup of OpenGL dependencies