Cleaning/deleting old code
Notification bug fix