(GCM GL) Cleanups