code review: removed observer