Remove a few more code chunks associated with the older split/merge support.