Clean up package.xml