Remove use of deprecated APIs

Yeah there's a comment that says that it's deprecated, but no Grim deprecation. I'll add one.