add moveit_plugins, remove geometric_shapes