main.cfg cleanups.