Removed Usages of UniqueList

See commits for details