diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 053cd3b24..31967a677 100644
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -15,7 +15,8 @@ string DemoComponent::GetName(void) const
 void DemoComponent::Start(void)
 {
 	m_DemoEndpoint = make_shared<VirtualEndpoint>();
-	m_DemoEndpoint->RegisterMethodHandler("demo::HelloWorld", bind_weak(&DemoComponent::HelloWorldRequestHAndler, shared_from_this()));
+	m_DemoEndpoint->RegisterMethodHandler("demo::HelloWorld",
+	    bind_weak(&DemoComponent::HelloWorldRequestHAndler, shared_from_this()));
 	m_DemoEndpoint->RegisterMethodSource("demo::HelloWorld");
 
 	EndpointManager::Ptr endpointManager = GetIcingaApplication()->GetEndpointManager();
@@ -42,6 +43,7 @@ void DemoComponent::Stop(void)
 
 int DemoComponent::NewEndpointHandler(const NewEndpointEventArgs& neea)
 {
+	/* Allow sending/receiving demo messages without authentication */
 	neea.Endpoint->AddAllowedMethodSinkPrefix("demo::");
 	neea.Endpoint->AddAllowedMethodSourcePrefix("demo::");
 
diff --git a/icinga-app/icinga.conf b/icinga-app/icinga.conf
index 440c71715..6af0fa60f 100644
--- a/icinga-app/icinga.conf
+++ b/icinga-app/icinga.conf
@@ -6,9 +6,6 @@
 	"rpclistener": {
 		"kekslistener": { "replicate": "0", "port": "7777" }
 	},
-	"rpcconnection": {
-		"keksclient": { "replicate": "0", "hostname": "localhost", "port": "7777" }
-	},
 	"host": {
 		"localhost": { "ipaddr": "127.0.0.1" }
 	}