Build changes, remove some unused C++ stuff.