LPS-48979 Keep consistency and delete dead code