Some GL cleanup