More cleanup for v4v