diff --git a/Snakefile b/Snakefile
index 1648e97040e93f5516a72b3514c7481ba093dc52..d7dd8fb1b48488e338b50e888d26666ecabd2378 100644
--- a/Snakefile
+++ b/Snakefile
@@ -38,6 +38,12 @@ if cluster_config:
 include: os.path.join("workflow", "rules", "paired_end.snakefile.smk")
 include: os.path.join("workflow", "rules", "single_end.snakefile.smk")
 
+onsuccess:
+    print("Workflow finished, no error.")
+    os.system("rm -rv " + config['kallisto_indexes'])
+    os.system("rm -rv " + config['salmon_indexes'])
+    os.system("rm -rv " + config['alfa_indexes'])
+
 rule finish:
     """
         Rule for collecting outputs
@@ -195,8 +201,6 @@ rule create_index_star:
             "STAR_index",
             "chrName.txt")
 
-    shadow: "full"
-
     params:
         output_dir = os.path.join(
             config['star_indexes'],
@@ -386,8 +390,6 @@ rule create_index_kallisto:
             "{organism}",
             "kallisto.idx")
 
-    shadow: "full"
-
     params:
         output_dir = os.path.join(
             config['kallisto_indexes'],
diff --git a/workflow/rules/paired_end.snakefile.smk b/workflow/rules/paired_end.snakefile.smk
index f06d4dcbf1cd77cec54ad02fb6a634f28994b524..a756856ef49bf9a3e7c7ec824e353becdc860659 100644
--- a/workflow/rules/paired_end.snakefile.smk
+++ b/workflow/rules/paired_end.snakefile.smk
@@ -401,7 +401,13 @@ rule pe_genome_quantification_kallisto:
             "samples",
             "{sample}",
             "quant_kallisto",
-            "{sample}.pe.kallisto.pseudo.sam")
+            "{sample}.pe.kallisto.pseudo.sam"),
+        abundances = os.path.join(
+            config["output_dir"],
+            "samples",
+            "{sample}",
+            "quant_kallisto",
+            "abundance.h5")
 
     shadow: "full"
 
diff --git a/workflow/rules/single_end.snakefile.smk b/workflow/rules/single_end.snakefile.smk
index 565bc013f0ac1ca1d31116fbda71b7c7069a23ee..a1c62e459c7b6c51f1fa323e0e29c3c60135e667 100644
--- a/workflow/rules/single_end.snakefile.smk
+++ b/workflow/rules/single_end.snakefile.smk
@@ -343,7 +343,14 @@ rule genome_quantification_kallisto:
             "samples",
             "{sample}",
             "quant_kallisto",
-            "{sample}.se.kallisto.pseudo.sam")
+            "{sample}.se.kallisto.pseudo.sam"),
+        abundances = os.path.join(
+            config["output_dir"],
+            "samples",
+            "{sample}",
+            "quant_kallisto",
+            "abundance.h5")
+
 
     shadow: "full"