Remove CppInt32 references