Did some cleanup of what happens when switching to Arranger mode