jf: CameraWrapper: clean up stuff left over from d2

Change-Id: Ife9ac2c8ad84e27b560f216868a837e385ad3efa