More deprecation warnings (#3579)

* Fixed more deprecation warnings

* unused import
1 file changed