remove old agent boilerplate
some xpath parsing for key/val pairs too