LPS-43939 Removes unused variables and format source