Revert "Revert "Revert "Revert "[Refactored] LairObserver""""

This reverts commit e0d566d58d0235bcd77ab14304afb564289541ab.