more deprecation warnings removed