minor fix
Cleanup and bug fix

Fixed and removed superfluous code. Also fixed a potential crash if no
servers are defined.