LPS-45044 - Code cleanup