- fix typos
- make auto-removal works for observee as well