Removed more Rcpp dependence