Cleanup vdev.c after hacking around