Merge "Refactor duplicate code handling removed uid entries and add tests."