Lps 48870 Removed instances of UniqueList

See individual commits for details.