Merge in conf cleanup from Terry