Notifications should be commented out in initial version