Merge "Remove unused xml config options"