Config cleanups