Removed all the V4V jazz, some cleanup too.