Remove deprecated field and method