Another round of file reference removals