more file cleanups