Cleaned parts of the code. Removed dependency from Axmodel.Data
Committing with last
Merge pull request #1 from shashisadasivan/dev

Dev