Some CXX-208 stuff

Kill some dead code