cleaning
now we use map, keys to get members
cleaning up compound associations