[nobug] remove deprecation warnings
7 files changed