Reverted back data dir moving (2 previous commits) and cleanup datadir after all