Vivow: clean up tree

Change-Id: Iaafc30345f68bdaefd5bbfd8e1b068ba3ccf85ec