Clean-Up for Vision

Change-Id: I50eadcef3472d4e11e7abebf51e010778f572c6c