Remove duplicate package definitions
Use tarballs instead of git