extract vendor cleanup