ENH: remove old API remainders