More file cleanups