Clean up vanirflash a bit

Change-Id: I5aa520ace58183252e65aee02dc22cb604f6a1c9