The eclass seems to already depend on a version of javatoolkit providing xml-rewrite-2.py so I don't see any reason to keep the old compatibility code around. Attached is a patch that removes it. Will test it for a while on my local machine and then commit unless someone objects. Regards, Petteri