[IMPROVEMENT] Remove popup from parent after use