Removed all instances of the old ion chamber classes and views since they were replaced withthe new SR570 controls and the like.
Fixed merge conflicts.