Remove all references to deleted fields