Removed more leftover xml files.
More branch merging cleanup.