Reverted TODO and removed some notifies