adding on remove notification listener and refactoring messages