LPS-50813 removed legacy clause