Clean up for cxxgen