Cleaning up vignettes