removed some unused classes. Still eed more polishing