hrbrmstr cleanup to pass CRAN checks