Cleanup _SI_ring C++ code