more config cleanups