Fixed redundancies within Primitives