LPS-42257 improve the code quality by removing unnessary dependencies to missleading code