[17] Cleaning same c++ crap.