Remove existing attachments improvement