Cleanup

* Etology no longer exists.
* Going with native support/Cutting back on xpath.