Started cleaning up Camera assignment.