Fix signature compilation
Start cleanup of primitives