Removed unused classes, corrected some comments