Clean up server init code