First pass to clean up character Ids