Remove unused field
Handle null route
Remove duplicate alerts