Cleanup vdac code... still more to do