clean up handling of cloned attachments