Cameras: cleanup