Removed manipulator1

Removed all of manipulator1 methods
Changed manipulator 2 name to manipulator