Cleaned up: Deleted old comments and unused classes