Cleanup datastore 2 as well