Clean up for manipulator and chunk refactor