Notification Step 3 + import cleanup in all files