removed unused classes and dependency