Cleaning up and removing vestigial code in race class