Clean up ControlModeSelector