Fix condition to clear removed device..
Remove some debug messages.