ITTE-942 Removed redundant classes and minor changes.