more old c++ cleanup