Spec: remove legacy deprecation warnings