more virtd cleanup
WIP