Across the board semantics fixes, renaming, cleanup, etc.

Also adds any missing notification center -remove calls.
Remove a plethora of unneeded class declarations.