remove dependency on primitive.h and clean up everything related to that