Remove deprecations

This removes all usages of deprecated APIs.
Skinny arrow works here