Major cleanup of Primitive skills code. Removed lots of old/unnecessary code.