cleaned up the popups