more config cleanup