Cleanup of xml
Don't rebase