removing unneeded filter
Fixing notifications
Moving around imports