diff --git a/libguh-core/awsconnector.cpp b/libguh-core/awsconnector.cpp
index 4142c0bc..09144fd7 100644
--- a/libguh-core/awsconnector.cpp
+++ b/libguh-core/awsconnector.cpp
@@ -118,11 +118,6 @@ void AWSConnector::onConnected()
 
     // OK, we're registerd already, go straight to pairing setup
     setupPairing();
-
-//    // TODO: remove this again. just using this for testing now
-//    QStringList subscriptions;
-//    subscriptions.append(QString("eu-west-1:%1/%2/#").arg("7127d36f-9644-455c-bb14-4a23bfac65fe").arg(m_clientId));
-//    subscribe(subscriptions);
 }
 
 void AWSConnector::registerDevice()
@@ -372,7 +367,7 @@ ResponseCode AWSConnector::onSubscriptionReceivedCallback(util::String topic_nam
         } else if (!userId.isEmpty()) {
             qCDebug(dcAWS()) << "Pairing response for id:" << userId << statusCode;
             emit connector->devicePaired(userId, statusCode, message);
-            connector->subscribe({QString("eu-west-1:%1/listeningPeer/#").arg(userId)});
+            connector->subscribe({QString("%1/%2/#").arg(connector->m_clientId).arg(userId)});
         } else {
             qCWarning(dcAWS()) << "Received a pairing response for a transaction we didn't start";
         }
diff --git a/libguh-core/jsonrpc/jsonrpcserver.cpp b/libguh-core/jsonrpc/jsonrpcserver.cpp
index 6fa23de3..2bfa33f2 100644
--- a/libguh-core/jsonrpc/jsonrpcserver.cpp
+++ b/libguh-core/jsonrpc/jsonrpcserver.cpp
@@ -263,7 +263,6 @@ JsonReply *JsonRPCServer::RemoveToken(const QVariantMap &params)
 
 JsonReply *JsonRPCServer::SetupRemoteAccess(const QVariantMap &params)
 {
-    qWarning() << "SetupRemoteAccess called";
     QString idToken = params.value("idToken").toString();
     QString userId = params.value("userId").toString();
     GuhCore::instance()->cloudManager()->pairDevice(idToken, userId);
@@ -375,7 +374,6 @@ void JsonRPCServer::setup()
 void JsonRPCServer::processData(const QUuid &clientId, const QByteArray &data)
 {
     qCDebug(dcJsonRpcTraffic()) << "Incoming data:" << data;
-    qWarning() << "***F*f+DSF*DA*a+FD*SF*f+ASDF*S";
 
     TransportInterface *interface = qobject_cast<TransportInterface *>(sender());
     QJsonParseError error;
diff --git a/libguh-core/tcpserver.cpp b/libguh-core/tcpserver.cpp
index 806ae998..6ebb061c 100644
--- a/libguh-core/tcpserver.cpp
+++ b/libguh-core/tcpserver.cpp
@@ -225,13 +225,11 @@ void SslServer::onSocketReadyRead()
     m_receiveBuffer.append(socket->readAll());
     int splitIndex = m_receiveBuffer.indexOf("}\n{");
     while (splitIndex > -1) {
-        qWarning() << "******" << "emitting dataAcailable" << splitIndex;
         emit dataAvailable(socket, m_receiveBuffer.left(splitIndex + 1));
         m_receiveBuffer = m_receiveBuffer.right(m_receiveBuffer.length() - splitIndex - 2);
         splitIndex = m_receiveBuffer.indexOf("}\n{");
     }
     if (m_receiveBuffer.endsWith("}\n")) {
-        qWarning() << "*********" << "emitting dataAvailable" << m_receiveBuffer;
         emit dataAvailable(socket, m_receiveBuffer);
         m_receiveBuffer.clear();
     }