Remove buggy note editor
Merge