diff --git a/gercols/gercols.cpp b/gercols/gercols.cpp
index 437487c..98c5013 100644
--- a/gercols/gercols.cpp
+++ b/gercols/gercols.cpp
@@ -2,21 +2,6 @@
 
 Gercols::Gercols(QObject *parent)
 {
-
-//     Cria um json de configuração para teste.
-//     *************************************************************************/
-//    QJsonObject configTeste;
-//    QJsonObject configComputer;
-//    configComputer["operating_system"] = QJsonValue::fromVariant(QString(""));
-//    configComputer["user"] = QJsonValue::fromVariant(QString(""));
-//    configComputer["network_interface"] = QJsonValue::fromVariant(QString(""));
-//    configTeste["computer"] = configComputer;
-//    configTeste["hardware"] = QJsonValue::fromVariant(QString(""));
-//    configTeste["software"] = QJsonValue::fromVariant(QString(""));
-
-//    oCacic.setJsonToFile(configTeste,"configReq.json");
-//    /************************************************************************
-
     oColeta = new CColeta;
     //Pega chave do registro, que será pega na instalação.
     oCacic.setChaveCrypt(oCacic.getValueFromRegistry("Lightbase", "Cacic", "key").toString());
@@ -33,11 +18,6 @@ void Gercols::run()
     //emite sinal para começar a coleta
     emit iniciaColeta();
 
-    /* Json de teste sendo excluído
-     */
-//    oCacic.deleteFile("configReq.json");
-    /***********************************/
-
     oColeta->waitToCollect();
     //salva json em arquivo
     if (!oColeta->toJsonObject().isEmpty())
diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp
index 20cbbd5..a6f6d4f 100644
--- a/src/cacic_hardware.cpp
+++ b/src/cacic_hardware.cpp
@@ -294,6 +294,7 @@ QJsonObject cacic_hardware::coletaLinux()
     coletaLinuxIsNotebook(hardware);
     coletaLinuxPrinters(hardware);
 
+    lshwFile.remove();
     return hardware;
 }
 
@@ -434,7 +435,9 @@ void cacic_hardware::coletaLinuxIsNotebook(QJsonObject &hardware)
     foreach(QString line, consoleOutput){
         if(line.contains("Type:")
                 && (line.contains("Notebook") || line.contains("Portable")) ){
-                hardware["isNotebook"] = QJsonValue::fromVariant(QString("true"));
+                QJsonObject notebook;
+                notebook["value"] = QJsonValue::fromVariant(true);
+                hardware["isNotebook"] = notebook;
         }
     }
 
diff --git a/src/ccoleta.cpp b/src/ccoleta.cpp
index 7bb06db..e9bd6a8 100644
--- a/src/ccoleta.cpp
+++ b/src/ccoleta.cpp
@@ -44,40 +44,20 @@ void CColeta::run()
 {
     /* Versão do json de testes */
     QJsonObject coleta = oCacic.getJsonFromFile("getConfig.json");
-    qDebug() << coleta;
-    QJsonObject actions = coleta["reply"].toObject()["agentecomputer"].toObject()["actions"].toObject();
-    if( actions.contains("col_hard") ){
+//    qDebug() << coleta;
+    QJsonObject actions = coleta["reply"].toObject()["agentcomputer"].toObject()["actions"].toObject();
+//    qDebug() << actions["col_hard"] << actions["col_soft"];
+    if( actions.contains("col_hard") && actions["col_hard"].toBool()){
         this->hardwareIsFinish = false;
         emit beginHardware();
     } else
         this->hardwareIsFinish = true;
 
-    if ( actions.contains("col_soft") ){
+    if ( actions.contains("col_soft") && actions["col_soft"].toBool()){
         this->softwareIsFinish = false;
         emit beginSoftware();
     } else
         this->softwareIsFinish = true;
-    /************************************************************/
-
-
-    /* Versão do json definitiva, obtiva através do getConfig()
-    QJsonObject coleta = oCacic.getJsonFromFile("getConfig.json")["agentcomputer"].toObject();
-
-    foreach ( QJsonValue action, coleta["actions"].toArray() ){
-        QJsonObject jsonAction = action.toObject();
-
-        if( jsonAction.contains("col_hard") && jsonAction["col_hard"] == QJsonValue.fromVariant(QString("true")) ){
-            this->hardwareIsFinish = false;
-            emit beginHardware();
-        } else
-            this->hardwareIsFinish = true;
-        if ( jsonAction.contains("col_soft") && jsonAction["col_soft"] == QJsonValue.fromVariant(QString("true")) ){
-            this->softwareIsFinish = false;
-            emit beginSoftware();
-        } else
-            this->softwareIsFinish = true;
-    }
-    /************************************************************/
 
 }
 
--
libgit2 0.21.2