LPS-47323 Format source
LPS-47323 Do not use deprecate methods