Remove sender if there's no any
Added none for PUSHMODE
Resolve notification message