Remove references to Embeds