Close #132 Fix removing the active server