Removed old c++ code