Added one field and removed unused code