Bugfix - remove unnecessary notifications