Some cleanup in Camera, starting cleanup