deprecation warnings removed