Cleaning up the GL stuff and removing an unused import