package.xml cleanup