diff --git a/advancedviewdialog.cpp b/advancedviewdialog.cpp
index 7752c75..8cdd2ec 100644
--- a/advancedviewdialog.cpp
+++ b/advancedviewdialog.cpp
@@ -175,7 +175,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
                     dialog.getTime(),
                     dialog.getTimespan(),
                     dialog.getProject(),
-                    dialog.getSubproject(),
                     dialog.getWorkpackage(),
                     dialog.getText()
                 );
@@ -213,7 +212,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
             dialog.setTime(timeAssignment.time);
             dialog.setTimespan(timeAssignment.timespan);
             dialog.setProject(timeAssignment.project);
-            dialog.setSubproject(timeAssignment.subproject);
             dialog.setWorkpackage(timeAssignment.workpackage);
             dialog.setText(timeAssignment.text);
             again1:
@@ -226,7 +224,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
                     dialog.getTime(),
                     dialog.getTimespan(),
                     dialog.getProject(),
-                    dialog.getSubproject(),
                     dialog.getWorkpackage(),
                     dialog.getText()
                 );
diff --git a/dialogs/timeassignmentdialog.cpp b/dialogs/timeassignmentdialog.cpp
index 13abd07..dbfe091 100644
--- a/dialogs/timeassignmentdialog.cpp
+++ b/dialogs/timeassignmentdialog.cpp
@@ -36,10 +36,6 @@ TimeAssignmentDialog::TimeAssignmentDialog(const QMap<QString, QString> &project
         }
     }
 
-    for(const auto &subproject : settings.subprojects())
-        ui->comboBoxSubproject->addItem(subproject);
-    ui->comboBoxSubproject->clearEditText();
-
     for(const auto &workpackage : settings.workpackages())
         ui->comboBoxWorkpackage->addItem(workpackage);
     ui->comboBoxWorkpackage->clearEditText();
@@ -88,16 +84,6 @@ void TimeAssignmentDialog::setProject(const QString &project)
         qWarning() << "could not find project" << project;
 }
 
-QString TimeAssignmentDialog::getSubproject() const
-{
-    return ui->comboBoxSubproject->currentText();
-}
-
-void TimeAssignmentDialog::setSubproject(const QString &subproject)
-{
-    ui->comboBoxSubproject->setCurrentText(subproject);
-}
-
 QString TimeAssignmentDialog::getWorkpackage() const
 {
     return ui->comboBoxWorkpackage->currentText();
diff --git a/dialogs/timeassignmentdialog.h b/dialogs/timeassignmentdialog.h
index 916fd09..8d1161a 100644
--- a/dialogs/timeassignmentdialog.h
+++ b/dialogs/timeassignmentdialog.h
@@ -28,9 +28,6 @@ public:
     QString getProject() const;
     void setProject(const QString &project);
 
-    QString getSubproject() const;
-    void setSubproject(const QString &subproject);
-
     QString getWorkpackage() const;
     void setWorkpackage(const QString &workpackage);
 
diff --git a/dialogs/timeassignmentdialog.ui b/dialogs/timeassignmentdialog.ui
index 3587f7c..14d8dec 100644
--- a/dialogs/timeassignmentdialog.ui
+++ b/dialogs/timeassignmentdialog.ui
@@ -65,20 +65,13 @@
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QLabel" name="labelSubproject">
-       <property name="text">
-        <string>Subproject:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
       <widget class="QLabel" name="labelWorkpackage">
        <property name="text">
         <string>Workpackage:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="labelText">
        <property name="text">
         <string>Text:</string>
@@ -103,16 +96,6 @@
       <widget class="QComboBox" name="comboBoxProject"/>
      </item>
      <item row="3" column="1">
-      <widget class="QComboBox" name="comboBoxSubproject">
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-       <property name="insertPolicy">
-        <enum>QComboBox::NoInsert</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
       <widget class="QComboBox" name="comboBoxWorkpackage">
        <property name="editable">
         <bool>true</bool>
@@ -122,7 +105,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="4" column="1">
       <widget class="QComboBox" name="comboBoxText">
        <property name="editable">
         <bool>true</bool>
diff --git a/models/timeassignmentsmodel.cpp b/models/timeassignmentsmodel.cpp
index 73a1a70..e8babd8 100644
--- a/models/timeassignmentsmodel.cpp
+++ b/models/timeassignmentsmodel.cpp
@@ -31,7 +31,7 @@ int TimeAssignmentsModel::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
 
-    return 7;
+    return Columns::Count;
 }
 
 QVariant TimeAssignmentsModel::data(const QModelIndex &index, int role) const
@@ -45,13 +45,12 @@ QVariant TimeAssignmentsModel::data(const QModelIndex &index, int role) const
     case Qt::EditRole:
         switch(index.column())
         {
-        case 0: return timeAssignment.id;
-        case 1: return timeAssignment.time;
-        case 2: return timeAssignment.timespan;
-        case 3: return timeAssignment.project;
-        case 4: return timeAssignment.subproject;
-        case 5: return timeAssignment.workpackage;
-        case 6: return timeAssignment.text;
+        case Columns::Id:          return timeAssignment.id;
+        case Columns::Time:        return timeAssignment.time;
+        case Columns::Timespan:    return timeAssignment.timespan;
+        case Columns::Project:     return timeAssignment.project;
+        case Columns::Workpackage: return timeAssignment.workpackage;
+        case Columns::Text:        return timeAssignment.text;
         }
     }
 
@@ -69,13 +68,12 @@ QVariant TimeAssignmentsModel::headerData(int section, Qt::Orientation orientati
         case Qt::EditRole:
             switch(section)
             {
-            case 0: return tr("ID");
-            case 1: return tr("Time");
-            case 2: return tr("Timespan");
-            case 3: return tr("Project");
-            case 4: return tr("Subproject");
-            case 5: return tr("Workpackage");
-            case 6: return tr("Text");
+            case Columns::Id:          return tr("ID");
+            case Columns::Time:        return tr("Time");
+            case Columns::Timespan:    return tr("Timespan");
+            case Columns::Project:     return tr("Project");
+            case Columns::Workpackage: return tr("Workpackage");
+            case Columns::Text:        return tr("Text");
             }
         }
     default:
diff --git a/models/timeassignmentsmodel.h b/models/timeassignmentsmodel.h
index cedbcd9..57c3ace 100644
--- a/models/timeassignmentsmodel.h
+++ b/models/timeassignmentsmodel.h
@@ -12,6 +12,10 @@ class TimeAssignmentsModel : public QAbstractListModel
     Q_OBJECT
     Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
 
+    enum Columns {
+        Id, Time, Timespan, Project, Workpackage, Text, Count
+    };
+
 public:
     explicit TimeAssignmentsModel(StripsWidget &stripsWidget, QObject *parent = Q_NULLPTR);
 
diff --git a/translations/advancedviewplugin_de.ts b/translations/advancedviewplugin_de.ts
index b68cae8..fa5e9c8 100644
--- a/translations/advancedviewplugin_de.ts
+++ b/translations/advancedviewplugin_de.ts
@@ -59,32 +59,32 @@
         <translation>Kontierungen aktualisieren</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="191"/>
+        <location filename="../advancedviewdialog.cpp" line="190"/>
         <source>Could not create time assignment!</source>
         <translation>Konnte Kontierung nicht erstellen!</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="206"/>
+        <location filename="../advancedviewdialog.cpp" line="205"/>
         <source>Edit time assignment</source>
         <translation>Kontierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="207"/>
+        <location filename="../advancedviewdialog.cpp" line="206"/>
         <source>Delete time assignment</source>
         <translation>Kontierung löschen</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="242"/>
+        <location filename="../advancedviewdialog.cpp" line="239"/>
         <source>Could not edit time assignment!</source>
         <translation>Konnte Kontierung nicht bearbeiten!</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="250"/>
+        <location filename="../advancedviewdialog.cpp" line="247"/>
         <source>Do you really want to delete the time assignment?</source>
         <translation>Möchten Sie die Kontierung wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="264"/>
+        <location filename="../advancedviewdialog.cpp" line="261"/>
         <source>Could not delete time assignment!</source>
         <translation>Konnte Kontierung nicht löschen!</translation>
     </message>
@@ -179,16 +179,11 @@
     </message>
     <message>
         <location filename="../dialogs/timeassignmentdialog.ui" line="70"/>
-        <source>Subproject:</source>
-        <translation>Subprojekt:</translation>
-    </message>
-    <message>
-        <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
         <source>Workpackage:</source>
         <translation>Arbeitspaket:</translation>
     </message>
     <message>
-        <location filename="../dialogs/timeassignmentdialog.ui" line="84"/>
+        <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
         <source>Text:</source>
         <translation>Text:</translation>
     </message>
@@ -202,37 +197,32 @@
 <context>
     <name>TimeAssignmentsModel</name>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="71"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
         <source>Timespan</source>
         <translation>Zeitspanne</translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
-        <source>Subproject</source>
-        <translation>Subprojekt</translation>
-    </message>
-    <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="77"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
         <source>Workpackage</source>
         <translation>Arbeitspaket</translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="78"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
diff --git a/translations/advancedviewplugin_en.ts b/translations/advancedviewplugin_en.ts
index 80acdaf..60720e2 100644
--- a/translations/advancedviewplugin_en.ts
+++ b/translations/advancedviewplugin_en.ts
@@ -59,32 +59,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="191"/>
+        <location filename="../advancedviewdialog.cpp" line="190"/>
         <source>Could not create time assignment!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="206"/>
+        <location filename="../advancedviewdialog.cpp" line="205"/>
         <source>Edit time assignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="207"/>
+        <location filename="../advancedviewdialog.cpp" line="206"/>
         <source>Delete time assignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="242"/>
+        <location filename="../advancedviewdialog.cpp" line="239"/>
         <source>Could not edit time assignment!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="250"/>
+        <location filename="../advancedviewdialog.cpp" line="247"/>
         <source>Do you really want to delete the time assignment?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedviewdialog.cpp" line="264"/>
+        <location filename="../advancedviewdialog.cpp" line="261"/>
         <source>Could not delete time assignment!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -179,16 +179,11 @@
     </message>
     <message>
         <location filename="../dialogs/timeassignmentdialog.ui" line="70"/>
-        <source>Subproject:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
         <source>Workpackage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/timeassignmentdialog.ui" line="84"/>
+        <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
         <source>Text:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -202,37 +197,32 @@
 <context>
     <name>TimeAssignmentsModel</name>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="71"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
         <source>Timespan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
-        <source>Subproject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="77"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
         <source>Workpackage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/timeassignmentsmodel.cpp" line="78"/>
+        <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>