diff --git a/tools/daca2-addons.py b/tools/daca2-addons.py
index 340d738f7..12fdbb635 100644
--- a/tools/daca2-addons.py
+++ b/tools/daca2-addons.py
@@ -14,8 +14,7 @@ import os
 import datetime
 import time
 
-DEBIAN = ['ftp://ftp.sunet.se/pub/Linux/distributions/Debian/debian/',
-          'http://ftp.sunet.se/pub/Linux/distributions/Debian/debian/',
+DEBIAN = ['ftp://ftp.se.debian.org/debian/',
           'ftp://ftp.debian.org/debian/']
 
 
diff --git a/tools/daca2.py b/tools/daca2.py
index 2547c1fb8..3a118f2b4 100644
--- a/tools/daca2.py
+++ b/tools/daca2.py
@@ -14,8 +14,7 @@ import os
 import datetime
 import time
 
-DEBIAN = ['ftp://ftp.sunet.se/pub/Linux/distributions/Debian/debian/',
-          'http://ftp.sunet.se/pub/Linux/distributions/Debian/debian/',
+DEBIAN = ['ftp://ftp.se.debian.org/debian/',
           'ftp://ftp.debian.org/debian/']
 
 
diff --git a/tools/rundaca2.py b/tools/rundaca2.py
index 9b60e4d1a..623c22beb 100644
--- a/tools/rundaca2.py
+++ b/tools/rundaca2.py
@@ -12,8 +12,6 @@ if len(sys.argv) == 2:
     PASSWORD = sys.argv[1]
 
 # Upload file to sourceforge web server using scp
-
-
 def upload(file_to_upload, destination):
     if not os.path.isfile(file_to_upload):
         return
@@ -51,14 +49,18 @@ def daca2(foldernum):
     subprocess.call(['mv', 'cppcheck', os.path.expanduser('~/daca2/cppcheck-O2')])
 
     # run cppcheck
+    subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/' + folder)])
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/' + folder + '/results.txt'), 'evidente/results-' + folder + '.txt')
+    subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/lib' + folder)])
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), 'lib' + folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/lib' + folder + '/results.txt'), 'evidente/results-lib' + folder + '.txt')
 
     # run cppcheck addons
+    subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/' + folder)])
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/'+folder+'/results.txt'), 'evidente/addons-'+folder+'.txt')
+    subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/lib' + folder)])
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), 'lib' + folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/lib'+folder+'/results.txt'), 'evidente/addons-lib'+folder+'.txt')