Refactoring begins.
Refactoring
Added import.
Deleted unused entity
Merge pull request #1 from EvgenyKarkan/master

Cleanups.