diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
index 7fbb8f2f..1a73c20d 100644
--- a/src/ImportCsvDialog.cpp
+++ b/src/ImportCsvDialog.cpp
@@ -227,7 +227,7 @@ void ImportCsvDialog::updatePreview()
     ui->tablePreview->setRowCount(0);
 
     // Analyse CSV file
-    sqlb::FieldPtrVector fieldList = generateFieldList(selectedFile);
+    sqlb::FieldVector fieldList = generateFieldList(selectedFile);
 
     // Reset preview widget
     ui->tablePreview->clear();
@@ -239,8 +239,8 @@ void ImportCsvDialog::updatePreview()
 
     // Set horizontal header data
     QStringList horizontalHeader;
-    for(const sqlb::FieldPtr& field : fieldList)
-        horizontalHeader.push_back(field->name());
+    for(const sqlb::Field& field : fieldList)
+        horizontalHeader.push_back(field.name());
     ui->tablePreview->setHorizontalHeaderLabels(horizontalHeader);
 
     // Parse file
@@ -346,8 +346,8 @@ void ImportCsvDialog::matchSimilar()
         if (selectedHeader.size() == header.size())
         {
             bool matchingHeader = std::equal(selectedHeader.begin(), selectedHeader.end(), header.begin(),
-                                             [](const sqlb::FieldPtr& item1, const sqlb::FieldPtr& item2) -> bool {
-                                                return (item1->name() == item2->name());
+                                             [](const sqlb::Field& item1, const sqlb::Field& item2) -> bool {
+                                                return (item1.name() == item2.name());
                                              });
             if (matchingHeader) {
                 item->setCheckState(Qt::Checked);
@@ -382,9 +382,9 @@ CSVParser::ParserResult ImportCsvDialog::parseCSV(const QString &fileName, std::
     return csv.parse(rowFunction, tstream, count);
 }
 
-sqlb::FieldPtrVector ImportCsvDialog::generateFieldList(const QString& filename)
+sqlb::FieldVector ImportCsvDialog::generateFieldList(const QString& filename)
 {
-    sqlb::FieldPtrVector fieldList;        // List of fields in the file
+    sqlb::FieldVector fieldList;        // List of fields in the file
 
     // Parse the first couple of records of the CSV file and only analyse them
     parseCSV(filename, [this, &fieldList](size_t rowNum, const CSVRow& data) -> bool {
@@ -412,7 +412,7 @@ sqlb::FieldPtrVector ImportCsvDialog::generateFieldList(const QString& filename)
 
             // Add field to the column list. For now we set the data type to nothing but this might be overwritten later in the automatic
             // type detection code.
-            fieldList.push_back(sqlb::FieldPtr(new sqlb::Field(fieldname, "")));
+            fieldList.emplace_back(fieldname, "");
         }
 
         // Try to find out a data type for each column. Skip the header row if there is one.
@@ -422,7 +422,7 @@ sqlb::FieldPtrVector ImportCsvDialog::generateFieldList(const QString& filename)
             {
                 // If the data type has been set to TEXT, there's no going back because it means we had at least one row with text-only
                 // content and that means we don't want to set the data type to any number type.
-                QString old_type = fieldList.at(i)->type();
+                QString old_type = fieldList.at(i).type();
                 if(old_type != "TEXT")
                 {
                     QString content = QString::fromUtf8(data.fields[i].data, data.fields[i].data_length);
@@ -445,7 +445,7 @@ sqlb::FieldPtrVector ImportCsvDialog::generateFieldList(const QString& filename)
                     else if(old_type == "INTEGER" && convert_to_int)                    // It was integer so far and still is
                         new_type = "INTEGER";
 
-                    fieldList.at(i)->setType(new_type);
+                    fieldList.at(i).setType(new_type);
                 }
             }
         }
@@ -487,7 +487,7 @@ bool ImportCsvDialog::importCsv(const QString& fileName, const QString& name)
     }
 
     // Analyse CSV file
-    sqlb::FieldPtrVector fieldList = generateFieldList(fileName);
+    sqlb::FieldVector fieldList = generateFieldList(fileName);
     if(fieldList.size() == 0)
         return true;
 
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
index c3e65c6d..e74c5fe4 100644
--- a/src/ImportCsvDialog.h
+++ b/src/ImportCsvDialog.h
@@ -42,7 +42,7 @@ private:
     QStringList dontAskForExistingTableAgain;
 
     CSVParser::ParserResult parseCSV(const QString& fileName, std::function<bool(size_t, CSVRow)> rowFunction, size_t count = 0);
-    sqlb::FieldPtrVector generateFieldList(const QString& filename);
+    sqlb::FieldVector generateFieldList(const QString& filename);
 
     bool importCsv(const QString& f, const QString& n = QString());
 
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index 3ca56bd6..da0b0a71 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -1281,12 +1281,12 @@ QString DBBrowserDB::primaryKeyForEditing(const sqlb::ObjectIdentifier& table, c
     return QString();
 }
 
-bool DBBrowserDB::createTable(const sqlb::ObjectIdentifier& name, const sqlb::FieldPtrVector& structure)
+bool DBBrowserDB::createTable(const sqlb::ObjectIdentifier& name, const sqlb::FieldVector& structure)
 {
     // Build SQL statement
     sqlb::Table table(name.name());
     for(size_t i=0;i<structure.size();i++)
-        table.fields.push_back(*structure.at(i));
+        table.fields.push_back(structure.at(i));
 
     // Execute it and update the schema
     return executeSQL(table.sql(name.schema()));
diff --git a/src/sqlitedb.h b/src/sqlitedb.h
index f88164a9..b75a2fce 100644
--- a/src/sqlitedb.h
+++ b/src/sqlitedb.h
@@ -137,7 +137,7 @@ public:
     bool deleteRecords(const sqlb::ObjectIdentifier& table, const QStringList& rowids, const QString& pseudo_pk = QString());
     bool updateRecord(const sqlb::ObjectIdentifier& table, const QString& column, const QString& rowid, const QByteArray& value, bool itsBlob, const QString& pseudo_pk = QString());
 
-    bool createTable(const sqlb::ObjectIdentifier& name, const sqlb::FieldPtrVector& structure);
+    bool createTable(const sqlb::ObjectIdentifier& name, const sqlb::FieldVector& structure);
     bool renameTable(const QString& schema, const QString& from_table, const QString& to_table);
     bool addColumn(const sqlb::ObjectIdentifier& tablename, const sqlb::Field& field);
 
diff --git a/src/sqlitetypes.h b/src/sqlitetypes.h
index 15a5fe21..8550f909 100644
--- a/src/sqlitetypes.h
+++ b/src/sqlitetypes.h
@@ -158,7 +158,6 @@ using TriggerPtr = std::shared_ptr<Trigger>;
 using FieldPtr = std::shared_ptr<Field>;
 using ConstraintPtr = std::shared_ptr<Constraint>;
 using FieldVector = std::vector<Field>;
-using FieldPtrVector = std::vector<FieldPtr>;
 using IndexedColumnVector = std::vector<IndexedColumn>;
 using ConstraintMap = std::unordered_multimap<QStringList, ConstraintPtr, StringListHash>;
 using FieldInfoList = std::vector<FieldInfo>;