Remove uncecessary embeds

Change-Id: I48a9f2e6a08c4e59365086f9745b5ac9d33cd448