convert to using pybindxml, lots of cleanup