diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 14364cba5..cb55fa726 100644
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -176,23 +176,13 @@ void CheckerComponent::AssignServiceRequestHandler(const Endpoint::Ptr& sender,
 
 void CheckerComponent::ClearServicesRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request)
 {
-	Application::Log(LogDebug, "checker", "Clearing service delegations.");
+	Application::Log(LogInformation, "checker", "Clearing service delegations.");
 
 	/* clear the services lists */
 	m_Services = ServiceQueue();
 	m_PendingServices.clear();
 
 	/* TODO: clear checks we've already sent to the thread pool */
-
-	string id;
-	if (request.GetID(&id)) {
-		ResponseMessage rm;
-		rm.SetID(id);
-
-		MessagePart result;
-		rm.SetResult(result);
-		GetEndpointManager()->SendUnicastMessage(m_CheckerEndpoint, sender, rm);
-	}
 }
 
 EXPORT_COMPONENT(checker, CheckerComponent);
diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index 9fa360018..a05e07701 100644
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -80,11 +80,13 @@ void DelegationComponent::AssignServiceResponseHandler(Service& service, const E
 
 void DelegationComponent::ClearServices(const Endpoint::Ptr& checker)
 {
+	RequestMessage request;
+	request.SetMethod("checker::ClearServices");
 
-}
+	MessagePart params;
+	request.SetParams(params);
 
-void DelegationComponent::RevokeServiceResponseHandler(Service& service, const Endpoint::Ptr& sender, bool timedOut)
-{
+	GetEndpointManager()->SendUnicastMessage(m_DelegationEndpoint, checker, request);
 }
 
 vector<Endpoint::Ptr> DelegationComponent::GetCheckerCandidates(const Service& service) const
diff --git a/components/delegation/delegationcomponent.h b/components/delegation/delegationcomponent.h
index 0ab714737..44140deb4 100644
--- a/components/delegation/delegationcomponent.h
+++ b/components/delegation/delegationcomponent.h
@@ -39,7 +39,6 @@ private:
 	Timer::Ptr m_DelegationTimer;
 
 	void AssignServiceResponseHandler(Service& service, const Endpoint::Ptr& sender, bool timedOut);
-	void RevokeServiceResponseHandler(Service& service, const Endpoint::Ptr& sender, bool timedOut);
 
 	void DelegationTimerHandler(void);