Main Ctrl cleanup