Are you sure getting rid of `data_dir` is the right thing to do?