Updated basicNotification
Removed legacy code and adjusted files