Clean up for CRAN checks