Change to remove notification in case of message expire