When deleting a file from the usage - support all the file fields.

Relate to issue #1426