Simplification - also considering removing classes.

Work that was started with Stefan in June.