Avro cleanup