Remove expand datastore function