Fix bug where connected servers would show on wrong groups

I was using the index instead of the id to search through
the connected server groups. Fixed.

Also removed legacy code now that this bug has been fixed.