removed some unused classes, cleanup