Config cleanups.