Cleaned up package.xml