Remove unused Yaml imports.
Merge pull request #621 from jmaas/master

Remove unused Yaml imports.