h-s modifications
Remove illegal definitions
Add PrimopWrappers