Cleanup and update of sample.config (server config) file