Remove use of editor-view