get rid of last few find_dataset() and unnecessary find_file()