Main Ctrl cleanup and GCL1-12547