XPathExpressionBased Search for elements
removed all local extra classes that are not used anywhere else