Updated all the different DeviceTypes for a device
Removed extra commented out code.