remove vendor, fix ctor