Finished clean up of control window