clean up
Merge branch 'ob_affinity'