Moved this code into a signal that will handle attachments and headers for all deletes