Cleanup popup more