Refactoring and improving code quality. Removing old notification sending mechanism