some cleanup of widgets