Add dup removal.
"Fix" tests?!