As far as I can see this class is dead code, it should be possible to remove it fully