Quick cleaning

* Cleaning for use of the XML Library Tool