Remove EditorLogin Close channels a bit more eagerly Put cancellation in where channels may get blocked up