Get rid of XPath & QSA implementations' artefacts
Overall progress, still lots of refactor to do