more file and version cleanup