(Glide2GL) Some cleanups