all the clean up from the merge is complete. the merge caused the "race_startup_routine" to be declared several times. this has been changed to have only 1.

Signed-off-by: rkburnside <richard@burnsides.org>