bunch of cleanup for R CMD check