Some clean-up + added vendorsetup