Notification view cleanup, first steps