the attached patch removes XPSAssembler and its helper classes from lenya trunk.
Created attachment 13966 [details] Patch to remove XPSAssembler