remove some deprecation warnings