Some configuration cleanup.