better cleanup of removed widgets