Some file cleanups