LPS-35974 - Code cleanup