Cleanup to pass R CMD CHECK

Even though we don’t expect a CRAN push.