Removing unneeded settings from xds.  General cleanup.