remove deprecated and duplicates