Removed unused comments and unused class