simplify affinity options per #37