fix data path
clean up