LPS-35873 Remove usages
LPS-35873 Remove test