Make StoreDirectory static and cleaneup delete logging code