Deprecation warnings removed.