Revert "Delete vendorsetup.sh"

This reverts commit c8324e9d5d14056c29cfad955d1f3d74501d785a.
Revert "More Omni"

This reverts commit 864296904e40b2700278bb211130a59a0854e43a.
Clean up