Remove the eager killing of editor instance. Probably the wrong place to do cleanup anyway