Optimize for low groups.
Removed obsolete classes.
More work on partial solutions.