Clean up C++ scorer and query server