Remove usage of deprecated APIs

Yep. You're right. I'm worried about us missing stuff in general for just this reason. But I suppose when we turn on the real warnings anything we missed will shake out pretty quickly.