more cleanup and move proprietary blobs to vendor