Update the uploader to use the new mapping API
Remove duplications from the mapping on demand