Tonite I spent 3 hours cleaning up a bit. I am basically struggling to make the code work for both the device and the control point side. Tonite I managed to remove all dependencies of device in service so a service can be used in the 2 cases (hosted or controlled) …