Finally get the XML/XPath stuff sorted out by configuration
Delete cruft that's no longer needed
Adjust IntelliJ code stye for groovy