implemented server removal and better c9.io handling