Remove unused struct field
Add file argument