Remove use of HawtBuf