Removed code that would never run.
Work on notifications section.