Simplification - also considering removing classes.

Then lets shift it over to using skimage image as quickly as possible.