Removing unused ClientStore