Removed server independencies