vivo: EMMC cleanup.
Some sorting out was done to ensure that the code works properly.