various odd file cleanups