cleanups on the way to 2D opengl output