Clean up some things, GL stuff still the same @AesenV.