Default sort on server name

Also removed unnecessary code.