Embed (unused code removed)

It seems like I didn't resolved conflicts properly during rebase. This should remove unused code and add new test file.