Try harder to clean up uniques list.