Removed commented-out chunks