DataDirs: cleanup