Cleanup

Removed remnant SimpleXMLElement code, and comments.