TEZ-716. Remove some unnecessary classes. (sseth)