Using vnames and cleanup