Moving affinity groups out of account