General config cleanups