Remove duplication of fields and methods