rigging: cleanup