Clean up xml

Change-Id: I51a95ea8781ef7db4a419bc690383ff340db5ba0