Remove deprecation warnings
2 files changed