Trying to clean up some config mess.