fix join files
cleanups