Actually now that I look at the unit tests, I think we could remove the tests and then remove these two APIs completely