Updated server config, cleanup