Remove dependencies and edit vendorsetup