remove deprecation warnings #4