moved clients from data_store