Makefile fixes (drop PROJ_CXX), and remove old C++ code.