Remove now-useless code

Now that the object-oriented version should be complete,
remove the now-useless code