Final file usage update

From #1640. 

Will take about an hour to run.