-Cleanup
-Externalized XML into files for unit tests