Packages from the vendor brainswarm

brainswarm/cleanup