Removing Vi... wouldn't be proper to leave it in there...