Fix removal of annotations