Arm rig clean up