Removed unnecessary popup