Delete unused symlink
Add embedded scenario support