remove num_cameras part 1

+ cosmetic fixes