diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
index 328e1d0f4..bdda71461 100644
--- a/lib/remote/eventshandler.cpp
+++ b/lib/remote/eventshandler.cpp
@@ -116,16 +116,12 @@ bool EventsHandler::HandleRequest(
 		auto event (subscriber.GetInbox()->Shift(yc));
 
 		if (event) {
-			CpuBoundWork buildingResponse (yc);
-
 			String body = JsonEncode(event);
 
 			boost::algorithm::replace_all(body, "\n", "");
 
 			asio::const_buffer payload (body.CStr(), body.GetLength());
 
-			buildingResponse.Done();
-
 			asio::async_write(stream, payload, yc);
 			asio::async_write(stream, newLine, yc);
 			stream.async_flush(yc);
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index cc80d7a7c..44073719f 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -102,8 +102,6 @@ void HttpServerConnection::Disconnect()
 			auto listener (ApiListener::GetInstance());
 
 			if (listener) {
-				CpuBoundWork removeHttpClient (yc);
-
 				listener->RemoveHttpClient(this);
 			}
 		}
@@ -240,8 +238,6 @@ bool HandleAccessControl(
 		auto headerAllowOrigin (listener->GetAccessControlAllowOrigin());
 
 		if (headerAllowOrigin) {
-			CpuBoundWork allowOriginHeader (yc);
-
 			auto allowedOrigins (headerAllowOrigin->ToSet<String>());
 
 			if (!allowedOrigins.empty()) {
@@ -251,8 +247,6 @@ bool HandleAccessControl(
 					response.set(http::field::access_control_allow_origin, origin);
 				}
 
-				allowOriginHeader.Done();
-
 				response.set(http::field::access_control_allow_credentials, "true");
 
 				if (request.method() == http::verb::options && !request[http::field::access_control_request_method].empty()) {
@@ -537,8 +531,6 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
 			auto authenticatedUser (m_ApiUser);
 
 			if (!authenticatedUser) {
-				CpuBoundWork fetchingAuthenticatedUser (yc);
-
 				authenticatedUser = ApiUser::GetByAuthHeader(std::string(request[http::field::authorization]));
 			}
 
diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 3bae3cafd..db35ef833 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -81,6 +81,8 @@ void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
 			CpuBoundWork handleMessage (yc);
 
 			MessageHandler(message);
+
+			l_TaskStats.InsertValue(Utility::GetTime(), 1);
 		} catch (const std::exception& ex) {
 			Log(m_ShuttingDown ? LogDebug : LogWarning, "JsonRpcConnection")
 				<< "Error while processing JSON-RPC message for identity '" << m_Identity
@@ -88,10 +90,6 @@ void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
 
 			break;
 		}
-
-		CpuBoundWork taskStats (yc);
-
-		l_TaskStats.InsertValue(Utility::GetTime(), 1);
 	}
 
 	Disconnect();