Removed server-specific stuff.