removed unused classes and tweaked comments