Remove unused field and method