Remove numCalled hack used for testing