Remove races and tidy.