#479 removed unused classes and methods