ID de-duplication, take two