The Invoices from my store is showing the Telephone Number in the Email row, and the Telephone entry is blank. (see attached).

In the Admin, I've had a look at the Email Templates, and it is showing correctly as {email} in the email row, and {telephone} in the telephone row.

I've also had a look at the "catalog/view/theme/default/template/checkout/guest.tpl" template and it seems to have them as email and telephone correctly (see attached).

What do I need to amend to correct this error?

As an extra, what files would I need to amend to remove the "Fax" input from the Guest Checkout?