Removed server class