Cleanup from R CMD CHECK