Remove usage of deprecated methods
9 files changed