minor (much needed) file cleanups