More file encoding cleanup