Fix: xCam cleanup