Update conf.sample, drop old config