Refactoring
Removed unnecessary popup notification