removed strange airbnb specific logic from clientSync