updates: clean up commented out cherries

Change-Id: I649859e483d79bb4fb3c6b441105096cee5473ce