Fixed issue with annotations not being fully removed when exit from editing