Removed observer
Refactoring