Embeds: Lots of cleanup