Code refactoring and deleted unused classes.