LPS-47323 Do not use deprecate methods