Removed DeviceDetection where it can be optionable.