Removed PopUp and Controller