MSA-1782: This is a convenience application: We have a TV in our lab which is always on and causes a lot of distraction for people who are working there. The purpose of this application is manage the time that the screen is on as follows: The application turns on the outlet if the entrace door opens (multipurpose sensor) and there is motion in front of the motion sensor for a user defined amount of time (say 5 minutes). If there is no activity in front of the motion sensor for a user defined amount of time (say 10 minutes) the outlet is turned off.

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -7,7 +7,6 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
-		capability "Bridge"
 		capability "Health Check"
 
 		attribute "networkAddress", "string"

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

@@ -14,7 +14,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}
 
 	simulator {

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

@@ -13,7 +13,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}
 
 	simulator {

devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy

@@ -36,7 +36,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Contact Sensor"
-		capability "Light"
 
 		attribute "powered", "string"
 

devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy

@@ -24,7 +24,6 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
-		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"
 
@@ -80,8 +79,7 @@ def parse(String description) {
 		*/
 		event.value = event.value / 10
 	}
-
-	return event ? createEvent(event) : event
+	return event
 }
 
 def setLevel(value) {

devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy

@@ -4,7 +4,6 @@ metadata {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
-		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -83,8 +83,9 @@ def parse(String description) {
 
 	if (event) {
 		if (event.name == "power") {
-			def value = (event.value as Integer) / 10
-			event = createEvent(name: event.name, value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true)
+			event.value = event.value / 10
+			event.descriptionText = '{{ device.displayName }} power is {{ value }} Watts'
+			event.translatable = true
 		} else if (event.name == "switch") {
 			def descriptionText = event.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
 			event = createEvent(name: event.name, value: event.value, descriptionText: descriptionText, translatable: true)
@@ -105,7 +106,7 @@ def parse(String description) {
 			log.debug "${cluster}"
 		}
 	}
-	return event ? createEvent(event) : event
+	return event
 }
 
 def off() {

devicetypes/smartthings/zigbee-dimmer-power.src/README.md

@@ -23,7 +23,6 @@ Works with:
 * **Switch** - can detect state (possible values: on/off)
 * **Switch Level** - represents current light level, usually 0-100 in percent
 * **Health Check** - indicates ability to get device health notifications
-* **Light** - indicates that the device belongs to Light category.
 
 ## Device Health
 

devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy

@@ -22,7 +22,6 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
-        capability "Light"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702"

devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy

@@ -21,7 +21,6 @@ metadata {
         capability "Sensor"
         capability "Switch"
         capability "Health Check"
-        capability "Light"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"

devicetypes/smartthings/zwave-dimmer-switch-generic.src/README.md

@@ -6,12 +6,6 @@ Works with:
 
 * [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW)](https://www.smartthings.com/works-with-smartthings/outlets/leviton-plug-in-lamp-dimmer-module)
 * [Leviton Universal Dimmer (DZMX1-LZ)](https://www.smartthings.com/works-with-smartthings/switches-and-dimmers/leviton-universal-dimmer)
-* [Leviton 1000W Incandescent Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-1000w-incandescent-dimmer)
-* [Leviton 600W Incandescent Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-600w-incandescent-dimmer)
-* [Enerwave In-Wall Dimmer](https://www.smartthings.com/works-with-smartthings/enerwave/enerwave-in-wall-dimmer-zw500d)
-* [Leviton 3-Speed Fan Controller](https://www.smartthings.com/works-with-smartthings/leviton/leviton-3-speed-fan-controller)
-* [Leviton Magnetic Low Voltage Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-magnetic-low-voltage-dimmer)
-* [Remotec Technology Plug-In Dimmer](https://www.smartthings.com/works-with-smartthings/remotec-technology/remotec-technology-plug-in-dimmer)
 
 ## Table of contents
 
@@ -46,9 +40,4 @@ If the device doesn't pair when trying from the SmartThings mobile app, it is po
 Pairing needs to be tried again by placing the device closer to the hub.
 Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
 * [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Leviton Universal Dimmer (DZMX1-LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Leviton 1000W Incandescent Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Leviton 600W Incandescent Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Leviton 3-Speed Fan Controller Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Enerwave In-Wall Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204854176-How-to-connect-Enerwave-switches-and-dimmers)
-* [Remotec Technology Plug-In Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202295150-Remotec-Technology-Plug-In-Dimmer-ZDS-100-)
+* [Leviton Universal Dimmer (DZMX1-LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -20,7 +20,6 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Light"
 
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
@@ -29,8 +28,6 @@ metadata {
 		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
 		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
 		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
-		fingerprint mfr:"0111", prod:"8200", model:"0200", deviceJoinName: "Remotec Technology Plug-In Dimmer"
-		fingerprint mfr:"1104", prod:"001D", model:"0501", deviceJoinName: "Leviton 1000W Incandescant Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy

@@ -25,7 +25,6 @@ metadata {
 		capability "Switch Level"
 		capability "Sensor"
 		capability "Actuator"
-		capability "Light"
 
 		command "reset"
 

devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy

@@ -21,7 +21,6 @@ metadata {
 		capability "Refresh"
 		capability "Configuration"
 		capability "Sensor"
-		capability "Light"
 
 		command "reset"
 

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -19,7 +19,6 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Light"
 
 		fingerprint inClusters: "0x25", deviceJoinName: "Z-Wave Switch"
 		fingerprint mfr:"001D", prod:"1A02", model:"0334", deviceJoinName: "Leviton Appliance Module"
@@ -27,8 +26,6 @@ metadata {
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
 		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
-		fingerprint mfr:"001D", prod:"0F01", model:"0334", deviceJoinName: "Leviton 5A Incandescent Switch"
-		fingerprint mfr:"001D", prod:"1603", model:"0334", deviceJoinName: "Leviton 15A Split Duplex Receptacle"
 		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
 		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}

devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy

@@ -20,7 +20,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		fingerprint mfr:"0063", prod:"4952", deviceJoinName: "Z-Wave Wall Switch"
 		fingerprint mfr:"0063", prod:"5257", deviceJoinName: "Z-Wave Wall Switch"

smartapps/nnoori0527/switch-control-based-on-motion-door-sensors.src/switch-control-based-on-motion-door-sensors.groovy

@@ -0,0 +1,179 @@
+/**
+ *  Switch control based on motion/door sensors
+ *
+ *  Copyright 2017 narges noori
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+definition(
+    name: "Switch control based on motion/door sensors",
+    namespace: "nnoori0527",
+    author: "narges noori",
+    description: "This application turns on the outlet if the entrace door opens (multipurpose sensor) and there is motion in front of the motion sensor for a user defined amount of time (say 5 minutes). If there is no activity in front of the motion sensor for a user defined amount of time (say 10 minutes) the outlet is turned off.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    oauth: [displayName: "Switch/outlet control", displayLink: ""])
+
+
+
+
+preferences {
+
+	section ("Allow external service to control these things...") {
+    	input "switches", "capability.switch", multiple: true, required: true
+    }
+    
+    section("Turn on when motion detected after someone opens the door:") {
+        input "motionSensor", "capability.motionSensor", required: true, title: "Where?"
+    }
+    
+    section("Turn on when there's movement for:") {
+        input "minutes", "number", required: true, title: "Minutes to turn on TV?"
+    }
+    section("Turn on when there's movement for:") {
+        input "minutesInactive", "number", required: true, title: "Minutes to wait before turning off TV?"
+    }
+   
+    
+    section("Turn on when door open:") {
+        input "doorOpenCloseDetector", "capability.contactSensor", required: true, title: "Where?"
+    }
+
+    section("Turn on this outlet") {
+        input "tvOutlet", "capability.switch", required: true
+    }
+    
+}
+
+def installed() {
+    initialize()
+}
+
+def updated() {
+    unsubscribe()
+    initialize()
+}
+
+def initialize() {
+    subscribe(doorOpenCloseDetector, "contact.open", doorOpenedHandler)
+    subscribe(motionSensor, "motion.inactive", motionStoppedHandler)
+}
+
+def doorOpenedHandler(evt){
+	log.debug "doorOpenedHandler called: $evt"
+    runIn(60 * minutes, checkMotion)
+    //tvOutlet.on()
+}
+
+def checkMotion() {
+    log.debug "In checkMotion scheduled method"
+
+    def motionState = motionSensor.currentState("motion")
+
+    if (motionState.value == "active") {
+        // get the time elapsed between now and when the motion reported inactive
+        def elapsed = now() - motionState.date.time
+
+        // elapsed time is in milliseconds, so the threshold must be converted to milliseconds too
+        def threshold = 1000 * 60 * minutes
+
+        if (elapsed <= threshold) {
+            log.debug "Motion has stayed active long enough since last check ($elapsed ms):  turning outlet on"
+            //myswitch.on()
+            tvOutlet.on()
+        } else {
+            log.debug "Motion has not stayed active long enough since last check ($elapsed ms):  doing nothing"
+        }
+    } else {
+        // Motion active; just log it and do nothing
+        log.debug "Motion is inactive, do nothing and wait for active"
+    }
+}
+
+def motionStoppedHandler(evt) {
+    log.debug "motionStoppedHandler called: $evt"
+    runIn(60 * (minutesInactive+1), checkMotionTurnOff)
+}
+
+def checkMotionTurnOff() {
+    log.debug "In checkMotionTurnOff scheduled method"
+
+    def motionState = motionSensor.currentState("motion")
+
+    if (motionState.value == "inactive") {
+        // get the time elapsed between now and when the motion reported inactive
+        def elapsed = now() - motionState.date.time
+
+        // elapsed time is in milliseconds, so the threshold must be converted to milliseconds too
+        def threshold = 1000 * 60 * minutesInactive
+
+        if (elapsed >= threshold) {
+            log.debug "Motion has stayed inactive long enough since last check ($elapsed ms):  turning switch off"
+            tvOutlet.off()
+        } else {
+            log.debug "Motion has not stayed inactive long enough since last check ($elapsed ms):  doing nothing"
+        }
+    } else {
+        // Motion active; just log it and do nothing
+        log.debug "Motion is active, do nothing and wait for inactive"
+    }
+} 
+
+
+
+mappings {
+  path("/switches") {
+    action: [
+      GET: "listSwitches"
+    ]
+  }
+  path("/switches/:command") {
+    action: [
+      PUT: "updateSwitches"
+    ]
+  }
+}
+
+// returns a list like
+// [[name: "kitchen lamp", value: "off"], [name: "bathroom", value: "on"]]
+def listSwitches() {
+
+    def resp = []
+    switches.each {
+        resp << [name: it.displayName, value: it.currentValue("switch")]
+    }
+    return resp
+}
+
+void updateSwitches() {
+    // use the built-in request object to get the command parameter
+    def command = params.command
+
+    // all switches have the comand
+    // execute the command on all switches
+    // (note we can do this on the array - the command will be invoked on every element
+    switch(command) {
+        case "on":
+            switches.on()
+            break
+        case "off":
+            switches.off()
+            break
+        default:
+            httpError(400, "$command is not a valid command for all switches specified")
+    }
+
+}
+
+
+

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -17,14 +17,14 @@
  */
 
 definition(
-		name: "Hue (Connect)",
-		namespace: "smartthings",
-		author: "SmartThings",
-		description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.",
-		category: "SmartThings Labs",
-		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
-		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-		singleInstance: true
+	name: "Hue (Connect)",
+	namespace: "smartthings",
+	author: "SmartThings",
+	description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.",
+	category: "SmartThings Labs",
+	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
+	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
+	singleInstance: true
 )
 
 preferences {
@@ -85,8 +85,7 @@ def bridgeDiscovery(params=[:])
 	}
 
 	return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) {
-		section("Please wait while we discover your Hue Bridge. Kindly note that you must first configure your Hue Bridge and Lights using the Philips Hue application. " +
-				"Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
+		section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true
 		}
 	}
@@ -179,7 +178,7 @@ def bulbDiscovery() {
 	}
 
 	if (bulbRefreshCount > 200 && numFound == 0) {
-		// Time out after 10 minutes
+		// Time out to avoid endless discovery
 		state.inBulbDiscovery = false
 		bulbRefreshCount = 0
 		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
@@ -217,32 +216,32 @@ private sendDeveloperReq() {
 	def token = app.id
 	def host = getBridgeIP()
 	sendHubCommand(new physicalgraph.device.HubAction([
-			method: "POST",
-			path: "/api",
-			headers: [
-					HOST: host
-			],
-			body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
+		method: "POST",
+		path: "/api",
+		headers: [
+			HOST: host
+		],
+		body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
 }
 
 private discoverHueBulbs() {
 	def host = getBridgeIP()
 	sendHubCommand(new physicalgraph.device.HubAction([
-			method: "GET",
-			path: "/api/${state.username}/lights",
-			headers: [
-					HOST: host
-			]], "${selectedHue}", [callback: "lightsHandler"]))
+		method: "GET",
+		path: "/api/${state.username}/lights",
+		headers: [
+			HOST: host
+		]], "${selectedHue}", [callback: "lightsHandler"]))
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
 	log.trace "Verify Hue Bridge $deviceNetworkId"
 	sendHubCommand(new physicalgraph.device.HubAction([
-			method: "GET",
-			path: "/description.xml",
-			headers: [
-					HOST: host
-			]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
+		method: "GET",
+		path: "/description.xml",
+		headers: [
+			HOST: host
+		]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
 }
 
 private verifyHueBridges() {
@@ -400,7 +399,7 @@ def addBulbs() {
 					log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
 				}
 			} else {
-				//backwards compatable
+			 	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
 				d?.completedSetup = true
@@ -1152,7 +1151,7 @@ def setColorTemperature(childDevice, huesettings) {
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
 	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [ct: ct, on: true])
-	return "Setting color temperature to $ct"
+	return "Setting color temperature to $percent"
 }
 
 def setColor(childDevice, huesettings) {
@@ -1227,7 +1226,7 @@ private poll() {
 	def uri = "/api/${state.username}/lights/"
 	log.debug "GET: $host$uri"
 	sendHubCommand(new physicalgraph.device.HubAction("GET ${uri} HTTP/1.1\r\n" +
-			"HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue))
+		"HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue))
 }
 
 private isOnline(id) {
@@ -1244,10 +1243,10 @@ private put(path, body) {
 	log.debug "BODY: ${bodyJSON}"
 
 	sendHubCommand(new physicalgraph.device.HubAction("PUT $uri HTTP/1.1\r\n" +
-			"HOST: ${host}\r\n" +
-			"Content-Length: ${length}\r\n" +
-			"\r\n" +
-			"${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}"))
+		"HOST: ${host}\r\n" +
+		"Content-Length: ${length}\r\n" +
+		"\r\n" +
+		"${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}"))
 }
 
 /*

smartapps/smartthings/lifx-connect.src/lifx-connect.groovy

@@ -346,7 +346,7 @@ def devicesList(selector = '') {
 		if (resp.status == 200) {
 			return resp.data
 		} else {
-			log.debug("No response from device list call. ${resp.status} ${resp.data}")
+			log.error("Non-200 from device list call. ${resp.status} ${resp.data}")
 			return []
 		}
 	}
@@ -418,15 +418,9 @@ def updateDevices() {
 	}
 	getChildDevices().findAll { !selectors.contains("${it.deviceNetworkId}") }.each {
 		log.info("Deleting ${it.deviceNetworkId}")
-		if (state.devices[it.deviceNetworkId])
-			state.devices[it.deviceNetworkId] = null
-		// The reason the implementation is trying to delete this bulb is because it is not longer connected to the LIFX location.
-		// Adding "try" will prevent this exception from happening.
-		// Ideally device health would show to the user that the device is not longer accessible so that the user can either force delete it or remove it from the SmartApp.
-		try {
-			deleteChildDevice(it.deviceNetworkId)
-		} catch (Exception e) {
-			log.debug("Can't remove this device because it's being used by an SmartApp")
-		}
+		state.devices[it.deviceNetworkId] = null
+		deleteChildDevice(it.deviceNetworkId)
 	}
 }
+
+