Packages from the vendor cleanliness

cleanliness/contracts