Delete old config, minor syntax changes