Check with @tfm but I think this method and related can be removed altogether.