Removed device check. Bug fix for alerts