Cleanup for CRAN