remove vendor assert and should