Remove fields that don't exist any more