Cleanup from notifications refactor.

Refs #3521
Merge pull request #3615 from jaswilli/cleanup

Cleanup from notifications refactor.