cleanup
Revert: groovy -> structural search optional (15b43a6e9cb3c4ca1fa89c05018594de4ddd8945)