Revert "some refactoring in data model, fixed couple of bugs"

This reverts commit 64e98fb0557c2f6f4d3852a6a0955a98e07bddf9.
removed unused dependencies