yaml cleanup

Change-Id: Iedeb8412ddab76fc47ba874874e1619c7f8c1c3e