First pass.
Remove notifications.
More cleanup.
More cleanup.
Cleaner.
Cleanup.