Refactoring of models. Removed not need code.
Entity refactoring