cleanup for R CMD check
more cleanup for R CMD check