Clean up of race computation