Remove remaining C++ exception code