vigor: clean up part 2

Change-Id: Ia178d8921a7a20ea7ddb8007a616584427cd7aab