aggregator cleanup
removed some redudndant dependencies from the functional tests
removed a bunch of things that didn't need to be dependency managed
straightened out some modules that were hooked up weirdly