fixing potential double de-dupes
code cleanup