more cleanup after moving to single pane