Step 3 of Notification + import cleanups etc.