Yes. Once all are in C++ some can be cleaned up