removed unnecessary moves on primitives