(XDK) Get rid of unused primitive_t struct