*8235* Code de-duping