Remove popup mode for now