Removed some old comments and unused classes