Notification refactor

Removed! :+1: