diff --git a/ruby/lib/jam_ruby/resque/audiomixer.rb b/ruby/lib/jam_ruby/resque/audiomixer.rb
index 58a023222..66973b12a 100644
--- a/ruby/lib/jam_ruby/resque/audiomixer.rb
+++ b/ruby/lib/jam_ruby/resque/audiomixer.rb
@@ -211,6 +211,11 @@ module JamRuby
       File.delete(@output_mp3_filename) if File.exists(@output_mp3_filename)
       File.delete(@manifest_file) if File.exists(@manifest_file)
       File.delete(@error_out_filename) if File.exists(@error_out_filename)
+
+      @manifest[:files].each do |file|
+        filename = file[:filename]
+        File.delete(filename) if File.exists(filename)
+      end
     end
 
     def post_success(mix)
diff --git a/ruby/lib/jam_ruby/resque/quick_mixer.rb b/ruby/lib/jam_ruby/resque/quick_mixer.rb
index 4f949c6d3..f9b9d80bb 100644
--- a/ruby/lib/jam_ruby/resque/quick_mixer.rb
+++ b/ruby/lib/jam_ruby/resque/quick_mixer.rb
@@ -63,6 +63,8 @@ module JamRuby
 
         post_success(@quick_mix)
 
+        cleanup_files
+
         @@log.info("audiomixer job successful. mix_id #{quick_mix_id}")
 
       rescue Exception => e
@@ -121,6 +123,11 @@ module JamRuby
       end
     end
 
+    def cleanup_files()
+      File.delete(@input_ogg_filename) if File.exists(@input_ogg_filename)
+      File.delete(@output_mp3_filename) if File.exists(@output_mp3_filename)
+    end
+
 
     def fetch_audio_files
       @input_ogg_filename  = Dir::Tmpname.make_tmpname( ["#{Dir.tmpdir}/quick_mixer_#{@quick_mix.id}}", '.ogg'], nil)