Move data directory validity checks out of stores