remove more deprecation warnings