Remove a little bit of unused C++
auto merge of #9553 : brson/rust/lesscxx, r=thestinger