Removed extra notifications