Clean up old deps before packaging
Use new machete repo

[#71850572]