removed data manager layer, DI revisited
removed data manager layer, DI revisited
removed redundant content