added missing source parameter in notify and removed unnecessary lines