diff --git a/.gitconfig b/.gitconfig
index 8d17d8d..53adb70 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Daniel Vedder\n
-	email = d.vedder@web.de
+	email = daniel.vedder@stud-mail.uni-wuerzburg.de
 
 [core]
 	editor = vim

diff --git a/.gitconfig b/.gitconfig
index 8d17d8d..53adb70 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Daniel Vedder\n
-	email = d.vedder@web.de
+	email = daniel.vedder@stud-mail.uni-wuerzburg.de
 
 [core]
 	editor = vim
diff --git a/TODO b/TODO
deleted file mode 100644
index 924243b..0000000
--- a/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO
-
-* setup Emacs, julia-mode
-
-* install ESS, Julia, emacs-nox, tmux, fish
-
-* setup fish (chsh and config)
-
-* SSH config files
-
-* .gitconfig
-
-* w3m
\ No newline at end of file

diff --git a/.gitconfig b/.gitconfig
index 8d17d8d..53adb70 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Daniel Vedder\n
-	email = d.vedder@web.de
+	email = daniel.vedder@stud-mail.uni-wuerzburg.de
 
 [core]
 	editor = vim
diff --git a/TODO b/TODO
deleted file mode 100644
index 924243b..0000000
--- a/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO
-
-* setup Emacs, julia-mode
-
-* install ESS, Julia, emacs-nox, tmux, fish
-
-* setup fish (chsh and config)
-
-* SSH config files
-
-* .gitconfig
-
-* w3m
\ No newline at end of file
diff --git a/config b/config
index 5bc2c14..fe08893 100644
--- a/config
+++ b/config
@@ -1,12 +1,8 @@
-Host helios
-        HostName 185.11.139.238
-        User daniel
-
 Host oikos
-        HostName 81.169.173.132
-        User daniel
+	HostName 81.169.173.132
+	User daniel
 
 Host cctb
-		# gaia2, only accessible from the intranet
-		HostName 132.187.198.12
-		User csa87dave
+	# gaia2, only accessible from the intranet
+	HostName 132.187.198.12
+	User csa87dave

diff --git a/.gitconfig b/.gitconfig
index 8d17d8d..53adb70 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Daniel Vedder\n
-	email = d.vedder@web.de
+	email = daniel.vedder@stud-mail.uni-wuerzburg.de
 
 [core]
 	editor = vim
diff --git a/TODO b/TODO
deleted file mode 100644
index 924243b..0000000
--- a/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO
-
-* setup Emacs, julia-mode
-
-* install ESS, Julia, emacs-nox, tmux, fish
-
-* setup fish (chsh and config)
-
-* SSH config files
-
-* .gitconfig
-
-* w3m
\ No newline at end of file
diff --git a/config b/config
index 5bc2c14..fe08893 100644
--- a/config
+++ b/config
@@ -1,12 +1,8 @@
-Host helios
-        HostName 185.11.139.238
-        User daniel
-
 Host oikos
-        HostName 81.169.173.132
-        User daniel
+	HostName 81.169.173.132
+	User daniel
 
 Host cctb
-		# gaia2, only accessible from the intranet
-		HostName 132.187.198.12
-		User csa87dave
+	# gaia2, only accessible from the intranet
+	HostName 132.187.198.12
+	User csa87dave
diff --git a/setup.sh b/setup.sh
index f99d79f..05758fb 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,12 +11,12 @@
 sudo apt autoremove
 
 echo "Copying config files..."
-cp -v -t ~/ .tmux.conf
-cp -v -t ~/ .gitconfig
-mkdir ~/.config ~/.config/fish ~/.emacs.d ~/.ssh
-cp -v -t ~/.config/fish/ config.fish
-cp -v -t ~/.emacs.d/ init.el
-cp -v -t ~/.ssh/ config
+cp -v .tmux.conf ~/
+cp -v .gitconfig ~/
+mkdir -p ~/.config/fish ~/.emacs.d ~/.ssh
+cp -v config.fish ~/.config/fish/
+cp -v init.el ~/.emacs.d/
+cp -v config ~/.ssh/
 
 echo "Setting up fish shell..."
 chsh -s /usr/bin/fish