Add missing reference and added remove-popup
defonce