more cleanup. prepare for Rcpp11