moved event bus publication to dao and resulting changes - tests still partially broken
pruned unused dao functions