Clean up: deleted unused classes, added some comments