(GCMGL) Some cleanups