Fix comments and removed commented out code