Vanirize

Change-Id: I5fea0a79e95978ba5eac3a188043ccb19b5cd854