Clean up DeviceType