remove more C++ code.
less C++.
get rid of all remaining C++ code.
cleanups.