Removed unnecessary PopUp