Cleaning up some configuration settings/management