Clean up server bootstrap code