Cleanup, server configuration rework