LPS-33649
LPS-33955
LPS-33955 Remove methods instead of deprecating
LPS-33955 Source formatting