Vendor cleanup.
Testing WIP