Cleaning up some configuration