*8167* De-dupe code