(GCMGL) Cleanups