Cleaned parts of the code. Removed dependency from Axmodel.Data