Cleanup some redundant code in the speed check