Remove old config, use config object instead