Embed cleanup2