cleanup of data dir
updates to paths.