LPS-44128 cleanup deprecations