Starting to remove traces of OpenGL...