Remove Embed and related stuff from vectorisation