Remove unused primitives

This passes a 3 stage bootstrap on Mac OS X.