tag cleanup, start of notification refactoring
WIP major notification routing refactor