Remove some vi compatibility code