Cleanup, added server config