[cleanup] Sorted attachments