diff --git a/controllers/custom_wizard/wizard.rb b/controllers/custom_wizard/wizard.rb
index e0cf669d..7125fc8a 100644
--- a/controllers/custom_wizard/wizard.rb
+++ b/controllers/custom_wizard/wizard.rb
@@ -68,7 +68,8 @@ class CustomWizard::WizardController < ::ApplicationController
         result.merge!(redirect_to: submission.redirect_to)
       end
 
-      wizard.final_cleanup!
+      submission.remove if submission.present?
+      wizard.reset
     end
 
     render json: result
diff --git a/lib/custom_wizard/submission.rb b/lib/custom_wizard/submission.rb
index e12299d1..61bb008a 100644
--- a/lib/custom_wizard/submission.rb
+++ b/lib/custom_wizard/submission.rb
@@ -97,6 +97,17 @@ class CustomWizard::Submission
     new(wizard, data, user_id)
   end
 
+  def remove
+    if present?
+      user_id = @user.id
+      wizard_id = @wizard.id
+      submission_id = @id
+      data = PluginStore.get("#{wizard_id}_#{KEY}", user_id)
+      data.delete_if { |sub| sub["id"] == submission_id }
+      PluginStore.set("#{wizard_id}_#{KEY}", user_id, data)
+    end
+  end
+
   def self.cleanup_incomplete_submissions(wizard)
     user_id = wizard.user.id
     all_submissions = list(wizard, user_id: user_id)
diff --git a/spec/requests/custom_wizard/wizard_controller_spec.rb b/spec/requests/custom_wizard/wizard_controller_spec.rb
index f2000bda..87ff7efe 100644
--- a/spec/requests/custom_wizard/wizard_controller_spec.rb
+++ b/spec/requests/custom_wizard/wizard_controller_spec.rb
@@ -50,30 +50,55 @@ describe CustomWizard::WizardController do
     expect(response.parsed_body["error"]).to eq("We couldn't find a wizard at that address.")
   end
 
-  it 'skips a wizard if user is allowed to skip' do
-    put '/w/super-mega-fun-wizard/skip.json'
-    expect(response.status).to eq(200)
-  end
+  context 'when user skips the wizard' do
 
-  it 'lets user skip if user cant access wizard' do
-    @template["permitted"] = permitted_json["permitted"]
-    CustomWizard::Template.save(@template, skip_jobs: true)
+    it 'skips a wizard if user is allowed to skip' do
+      put '/w/super-mega-fun-wizard/skip.json'
+      expect(response.status).to eq(200)
+    end
 
-    put '/w/super-mega-fun-wizard/skip.json'
-    expect(response.status).to eq(200)
-  end
+    it 'lets user skip if user cant access wizard' do
+      @template["permitted"] = permitted_json["permitted"]
+      CustomWizard::Template.save(@template, skip_jobs: true)
 
-  it 'returns a no skip message if user is not allowed to skip' do
-    @template['required'] = 'true'
-    CustomWizard::Template.save(@template)
-    put '/w/super-mega-fun-wizard/skip.json'
-    expect(response.parsed_body['error']).to eq("Wizard can't be skipped")
-  end
+      put '/w/super-mega-fun-wizard/skip.json'
+      expect(response.status).to eq(200)
+    end
 
-  it 'skip response contains a redirect_to if in users submissions' do
-    @wizard = CustomWizard::Wizard.create(@template["id"], user)
-    CustomWizard::Submission.new(@wizard, redirect_to: "/t/2").save
-    put '/w/super-mega-fun-wizard/skip.json'
-    expect(response.parsed_body['redirect_to']).to eq('/t/2')
+    it 'returns a no skip message if user is not allowed to skip' do
+      @template['required'] = 'true'
+      CustomWizard::Template.save(@template)
+      put '/w/super-mega-fun-wizard/skip.json'
+      expect(response.parsed_body['error']).to eq("Wizard can't be skipped")
+    end
+
+    it 'skip response contains a redirect_to if in users submissions' do
+      @wizard = CustomWizard::Wizard.create(@template["id"], user)
+      CustomWizard::Submission.new(@wizard, redirect_to: "/t/2").save
+      put '/w/super-mega-fun-wizard/skip.json'
+      expect(response.parsed_body['redirect_to']).to eq('/t/2')
+    end
+
+    it "deletes the submission if user has filled up some data" do
+      @wizard = CustomWizard::Wizard.create(@template["id"], user)
+      CustomWizard::Submission.new(@wizard, step_1_field_1: "Hello World").save
+      current_submission = @wizard.current_submission
+      put '/w/super-mega-fun-wizard/skip.json'
+      list = CustomWizard::Submission.list(@wizard)
+
+      expect(list.any? { |submission| submission.id == current_submission.id }).to eq(false)
+    end
+
+    it "starts from the first step if user visits after skipping the wizard" do
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Text input"
+        }
+      }
+      put '/w/super-mega-fun-wizard/skip.json'
+      get '/w/super-mega-fun-wizard.json'
+
+      expect(response.parsed_body["start"]).to eq('step_1')
+    end
   end
 end