CameraViewController cleanup