clean destroyed popups based on their addresses
Merge branch 'customer-form-cleanup'