removed server dependency