Step 3 of Notificaiton + import cleanup in all files