Break out combine_membership internals into separate managers, then reference those in the CombinedMembershipManager
Remove unused classes.
Moves some stuff around.