Clean up for next CRAN release