(GCMGL) Cleanups #3