Revert: In progress refactoring of dock and aggregator (7f6598f)
In progress refactoring of dock and aggregator