Removed unused classes. Deleted old commented code.