More improvements to notifications level control. Removed unnecessary definitions from notifications.h