remove references to u8_t, u16_t