More code cleanup in camera.