Cleanup of MC user interface