more deprecation warning removals