[vim] Clean up v2 references

Clean up v2 specific calls.