removed unused classes
added some.