remove uses of low-level (non-st) deprecations