config cleanups