removed unused classes, removed unused methods
removed unused methods
removed deprecated methods