Some reorganization 1
Remove duplicates