More cleanup for GL