Doing some configuration cleanup.