Clean up mode selection in simulator