LPS-34895
LPS-34895 Remove duplicate code