More cleanup and improved OpenGL 1.1 model struct.