- cleanup / fix duplicates