GCL Cleanup - Refs: #1