More work on redundancy, refactor of server lists