diff --git a/libsrc/leddevice/CMakeLists.txt b/libsrc/leddevice/CMakeLists.txt
index 36ff875f..c2148226 100755
--- a/libsrc/leddevice/CMakeLists.txt
+++ b/libsrc/leddevice/CMakeLists.txt
@@ -17,7 +17,6 @@ SET(Leddevice_QT_HEADERS
 	${CURRENT_SOURCE_DIR}/LedRs232Device.h
 	${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
 	${CURRENT_SOURCE_DIR}/LedDeviceAdalightApa102.h
-	${CURRENT_SOURCE_DIR}/LedDeviceAmbiLed.h
 	${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.h
 	${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.h
 	${CURRENT_SOURCE_DIR}/LedHIDDevice.h
@@ -53,7 +52,6 @@ SET(Leddevice_SOURCES
 
 	${CURRENT_SOURCE_DIR}/LedDeviceAdalight.cpp
 	${CURRENT_SOURCE_DIR}/LedDeviceAdalightApa102.cpp
-	${CURRENT_SOURCE_DIR}/LedDeviceAmbiLed.cpp
 	${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.cpp
 	${CURRENT_SOURCE_DIR}/LedDeviceRawHID.cpp
 	${CURRENT_SOURCE_DIR}/LedDeviceLightpack.cpp
diff --git a/libsrc/leddevice/LedDeviceAmbiLed.cpp b/libsrc/leddevice/LedDeviceAmbiLed.cpp
deleted file mode 100644
index 755d146c..00000000
--- a/libsrc/leddevice/LedDeviceAmbiLed.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// STL includes
-#include <cstring>
-#include <cstdio>
-#include <iostream>
-
-// hyperion local includes
-#include "LedDeviceAmbiLed.h"
-
-LedDeviceAmbiLed::LedDeviceAmbiLed(const std::string& outputDevice, const unsigned baudrate, int delayAfterConnect_ms) :
-	LedRs232Device(outputDevice, baudrate, delayAfterConnect_ms),
-	_ledBuffer(0),
-	_timer()
-{
-	// setup the timer
-	_timer.setSingleShot(false);
-	_timer.setInterval(5000);
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(rewriteLeds()));
-
-	// start the timer
-	_timer.start();
-}
-
-int LedDeviceAmbiLed::write(const std::vector<ColorRgb> & ledValues)
-{
-	if (_ledBuffer.size() == 0)
-	{
-		_ledBuffer.resize(1 + 3*ledValues.size());
-		_ledBuffer[3*ledValues.size()] = 255;
-	}
-
-	// restart the timer
-	_timer.start();
-
-	// write data
-	memcpy( _ledBuffer.data(), ledValues.data(), ledValues.size() * 3);
-	return writeBytes(_ledBuffer.size(), _ledBuffer.data());
-}
-
-int LedDeviceAmbiLed::switchOff()
-{
-	// restart the timer
-	_timer.start();
-
-	// write data
-	memset(_ledBuffer.data(), 0, _ledBuffer.size()-6);
-	return writeBytes(_ledBuffer.size(), _ledBuffer.data());
-}
-
-void LedDeviceAmbiLed::rewriteLeds()
-{
-	writeBytes(_ledBuffer.size(), _ledBuffer.data());
-}
diff --git a/libsrc/leddevice/LedDeviceAmbiLed.h b/libsrc/leddevice/LedDeviceAmbiLed.h
deleted file mode 100644
index 6a99e071..00000000
--- a/libsrc/leddevice/LedDeviceAmbiLed.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-// STL includes
-#include <string>
-
-// Qt includes
-#include <QTimer>
-
-// hyperion incluse
-#include "LedRs232Device.h"
-
-///
-/// Implementation of the LedDevice interface for writing to an Adalight led device.
-///
-class LedDeviceAmbiLed : public LedRs232Device
-{
-	Q_OBJECT
-
-public:
-	///
-	/// Constructs the LedDevice for attached Adalight device
-	///
-	/// @param outputDevice The name of the output device (eg '/dev/ttyS0')
-	/// @param baudrate The used baudrate for writing to the output device
-	///
-	LedDeviceAmbiLed(const std::string& outputDevice, const unsigned baudrate, int delayAfterConnect_ms);
-
-	///
-	/// Writes the led color values to the led-device
-	///
-	/// @param ledValues The color-value per led
-	/// @return Zero on succes else negative
-	///
-	virtual int write(const std::vector<ColorRgb> & ledValues);
-
-	/// Switch the leds off
-	virtual int switchOff();
-
-private slots:
-	/// Write the last data to the leds again
-	void rewriteLeds();
-
-private:
-	/// The buffer containing the packed RGB values
-	std::vector<uint8_t> _ledBuffer;
-
-	/// Timer object which makes sure that led data is written at a minimum rate
-	/// The Adalight device will switch off when it does not receive data at least
-	/// every 15 seconds
-	QTimer _timer;
-};
diff --git a/libsrc/leddevice/LedDeviceFactory.cpp b/libsrc/leddevice/LedDeviceFactory.cpp
index 4013cf40..d688c722 100755
--- a/libsrc/leddevice/LedDeviceFactory.cpp
+++ b/libsrc/leddevice/LedDeviceFactory.cpp
@@ -23,7 +23,6 @@
 #endif
 
 #include "LedDeviceAdalight.h"
-#include "LedDeviceAmbiLed.h"
 #include "LedDeviceRawHID.h"
 #include "LedDeviceLightpack.h"
 #include "LedDeviceMultiLightpack.h"
@@ -80,17 +79,6 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
 
 		device = deviceAdalightApa102;
 	}
-	else if (type == "ambiled")
-	{
-		const std::string output = deviceConfig["output"].asString();
-		const unsigned rate      = deviceConfig["rate"].asInt();
-		const int delay_ms       = deviceConfig["delayAfterConnect"].asInt();
-
-		LedDeviceAmbiLed* deviceAmbiLed = new LedDeviceAmbiLed(output, rate, delay_ms);
-		deviceAmbiLed->open();
-
-		device = deviceAmbiLed;
-	}
 #ifdef ENABLE_SPIDEV
 	else if (type == "lpd6803" || type == "ldp6803")
 	{
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index f0003af6..60d3922f 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -72,7 +72,7 @@ void HyperionDaemon::run()
 	createGrabberDispmanx();
 
 	#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB)
-		ErrorIf(_config.isMember("framegrabber"), log, "No grabber can be instantiated, because all grabbers have been left out from the build");
+                ErrorIf(_config.isMember("framegrabber"), _log, "No grabber can be instantiated, because all grabbers have been left out from the build");
 	#endif
 
 }