Correct some issues with deleted widgets
more basic cleaning