Removed TODO and AbstractObserver