Some attachments cleanup.

Removed a useless code path.