diff --git a/.gitignore b/.gitignore
index bb8f88f759..41ec42389f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,9 @@
 favicon.*
 .htconfig.php
 \#*
-wip/*
 include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-push*
-langup
-merge
+favicon.*
 home.html
diff --git a/favicon.gif b/favicon.gif
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index e69de29bb2..0000000000