modules.popup: cleaning