Cleanup/patch legacy build XML