Typedefs

// Ethnio survey code removed