Feature parity with the C++ version

This means removing the profiling and verification stuff.