Removed observer logic