Cleaning up for widget management