-Removed primitives code