Cleaning up the widgets