Some stuff for maintaining the service, getting ready to rip out all these changes.
Revert "Some stuff for maintaining the service, getting ready to rip out all these changes."
Also ripped out notifications in general.

This reverts commit f004a971248a0a757ac43244752bd2ea4bb6cd4f.
some cleanup, think might be release ready