Removed legacy support for variables using Velocity: they are not needed since Groovy takes care of that now
Fixed typo
Removed the XML package because we are not using XML files anymore