avro tools cleanup after feedback