Cleanup of additional identifier processing