CameraUtil cleanup