CRAN asked for cleanup