Project: get rid of Avro definitions