diff --git a/src/generators/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp
index 74afe17..3f99dda 100644
--- a/src/generators/sqlgeneratorbase.cpp
+++ b/src/generators/sqlgeneratorbase.cpp
@@ -806,6 +806,9 @@ QString SqlGeneratorBase::dateTimePartName(const PhraseData::Condition &op) cons
     case PhraseData::AddSeconds:
     case PhraseData::AddSecondsDateTime:
         return "SECOND";
+
+    default:
+        break;
     }
     return QString();
 }
diff --git a/src/generators/sqlitegenerator.cpp b/src/generators/sqlitegenerator.cpp
index 0555c47..b261a4d 100644
--- a/src/generators/sqlitegenerator.cpp
+++ b/src/generators/sqlitegenerator.cpp
@@ -252,6 +252,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
                          dateTimePartName(op));
             break;
         }
+        default:
+            break;
         }
     }
     if (d->type == PhraseData::WithoutOperand) {
@@ -283,6 +285,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
             //        case PhraseData::DatePartMilisecond:
             //            return QString("CAST(strftime('%Y', %1) AS INT)")
             //                    .arg(createConditionalPhrase(d->left));
+        default:
+            break;
         }
     }
 
diff --git a/src/table.cpp b/src/table.cpp
index d27bb72..2a3b0bc 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -44,7 +44,7 @@ NUT_BEGIN_NAMESPACE
  */
 
 Table::Table(QObject *parent) : QObject(parent),
-    d(new TablePrivate(this))
+    d(new TablePrivate)
 { }
 
 Table::~Table()
@@ -200,7 +200,7 @@ void Table::setStatus(const Status &status)
 
 
 
-TablePrivate::TablePrivate(Table *parent) : QSharedData(),
+TablePrivate::TablePrivate() : QSharedData(),
     model(nullptr), status(Table::NewCreated), parentTableSet(nullptr)
 {
 
diff --git a/src/table_p.h b/src/table_p.h
index 41000d6..d544c94 100644
--- a/src/table_p.h
+++ b/src/table_p.h
@@ -16,7 +16,7 @@ class TablePrivate : public QSharedData {
     Q_DECLARE_PUBLIC(Table)
 
 public:
-    TablePrivate(Table *parent);
+    TablePrivate();
 
 
     TableModel *model;
diff --git a/src/tablemodel.cpp b/src/tablemodel.cpp
index 96dd138..f57eef0 100644
--- a/src/tablemodel.cpp
+++ b/src/tablemodel.cpp
@@ -30,12 +30,6 @@
 
 NUT_BEGIN_NAMESPACE
 
-/*
- * TODO: It may be good idea if we replace this QSet with two QHash!
- * one for className search and another for typeId.
- */
-QSet<TableModel*> TableModel::_allModels;
-
 QString TableModel::name() const
 {
     return _name;
@@ -269,14 +263,6 @@ TableModel::TableModel(const QJsonObject &json, const QString &tableName) : _typ
         QJsonObject relObject = fields.value(key).toObject();
         _foreignKeys.append(new RelationModel(relObject));
     }
-
-//    if(json.keys().contains(__nut_AUTO_INCREMENT))
-//        field(json.value(__nut_AUTO_INCREMENT).toString())->isAutoIncrement = true;
-
-//    if(json.keys().contains(__nut_PRIMARY_KEY))
-//        field(json.value(__nut_PRIMARY_KEY).toString())->isAutoIncrement = true;
-
-    _allModels.insert(this);
 }
 
 TableModel::~TableModel()
diff --git a/src/tablemodel.h b/src/tablemodel.h
index 9e28534..59f373b 100644
--- a/src/tablemodel.h
+++ b/src/tablemodel.h
@@ -129,9 +129,6 @@ private:
     int _typeId;
     QList<FieldModel*> _fields;
     QList<RelationModel*> _foreignKeys;
-
-    Q_DECL_DEPRECATED
-    static QSet<TableModel*>_allModels;
 };
 
 NUT_END_NAMESPACE