diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index f10d29b96..d6b8e1f3c 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -103,7 +103,6 @@ public:
 
 signals:
     void nextStatusChanged( bool status );
-    void done();
 
     /* Emitted when the viewstep thinks it needs more space than is currently
      * available for display. @p enlarge is the requested additional space,
diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp
index 3b807f69c..818a07909 100644
--- a/src/modules/finished/FinishedViewStep.cpp
+++ b/src/modules/finished/FinishedViewStep.cpp
@@ -70,7 +70,6 @@ FinishedViewStep::widget()
 void
 FinishedViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
index 2559ea635..3242e47e9 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
@@ -56,7 +56,6 @@ InteractiveTerminalViewStep::widget()
 void
 InteractiveTerminalViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 053266059..3e846db43 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -68,8 +68,6 @@ KeyboardViewStep::widget()
 void
 KeyboardViewStep::next()
 {
-    //TODO: actually save those settings somewhere
-    emit done();
 }
 
 
diff --git a/src/modules/license/LicenseViewStep.cpp b/src/modules/license/LicenseViewStep.cpp
index 41ca02a7e..a02ef36c6 100644
--- a/src/modules/license/LicenseViewStep.cpp
+++ b/src/modules/license/LicenseViewStep.cpp
@@ -62,7 +62,6 @@ LicenseViewStep::widget()
 void
 LicenseViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 4a6eb229a..4a30bc307 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -193,7 +193,6 @@ LocaleViewStep::widget()
 void
 LocaleViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp
index 6dd824b32..5104390eb 100644
--- a/src/modules/netinstall/NetInstallViewStep.cpp
+++ b/src/modules/netinstall/NetInstallViewStep.cpp
@@ -72,7 +72,6 @@ NetInstallViewStep::widget()
 void
 NetInstallViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 3c71302e0..34d9c4a81 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -294,23 +294,19 @@ PartitionViewStep::next()
         }
         else if ( m_choicePage->currentChoice() == ChoicePage::Erase )
         {
-            emit done();
             return;
         }
         else if ( m_choicePage->currentChoice() == ChoicePage::Alongside )
         {
-            emit done();
             return;
         }
         else if ( m_choicePage->currentChoice() == ChoicePage::Replace )
         {
-            emit done();
             return;
         }
         cDebug() << "Choice applied: " << m_choicePage->currentChoice();
         return;
     }
-    emit done();
 }
 
 
diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp
index ef319bde4..6e4a3e89c 100644
--- a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp
@@ -79,7 +79,6 @@ PlasmaLnfViewStep::widget()
 void
 PlasmaLnfViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp
index 4f60a3c4f..2ebfa449b 100644
--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@@ -54,7 +54,6 @@ SummaryViewStep::widget()
 void
 SummaryViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp
index 417e10fc0..8927c6865 100644
--- a/src/modules/tracking/TrackingViewStep.cpp
+++ b/src/modules/tracking/TrackingViewStep.cpp
@@ -70,7 +70,6 @@ TrackingViewStep::widget()
 void
 TrackingViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp
index 8ff7b0e7b..ad0fcb118 100644
--- a/src/modules/users/UsersViewStep.cpp
+++ b/src/modules/users/UsersViewStep.cpp
@@ -64,7 +64,6 @@ UsersViewStep::widget()
 void
 UsersViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/webview/WebViewStep.cpp b/src/modules/webview/WebViewStep.cpp
index 1db7c8e41..145ff36d5 100644
--- a/src/modules/webview/WebViewStep.cpp
+++ b/src/modules/webview/WebViewStep.cpp
@@ -75,7 +75,6 @@ WebViewStep::widget()
 void
 WebViewStep::next()
 {
-    emit done();
 }
 
 
diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index 86740fb3d..f3aa54532 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -63,7 +63,6 @@ WelcomeViewStep::widget()
 void
 WelcomeViewStep::next()
 {
-    emit done();
 }