diff --git a/.gitignore b/.gitignore
index 715fe23c42..fd228d9706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,10 +56,10 @@ paparazzi.sublime-workspace
 /paparazzi
 
 # /conf/
-/conf/conf.xml~
+/conf/conf.xml
 /conf/conf.xml.20*
 /conf/conf_personal.xml.20*
-/conf/control_panel.xml~
+/conf/control_panel.xml
 /conf/control_panel.xml.20*
 /conf/%gconf.xml
 /conf/maps_data/*
diff --git a/conf/conf.xml b/conf/conf.xml
deleted file mode 120000
index 8b45de80fa..0000000000
--- a/conf/conf.xml
+++ /dev/null
@@ -1 +0,0 @@
-userconf/OPENUAS/openuas_conf.xml
\ No newline at end of file
diff --git a/conf/control_panel.xml b/conf/control_panel.xml
deleted file mode 120000
index 99dae21217..0000000000
--- a/conf/control_panel.xml
+++ /dev/null
@@ -1 +0,0 @@
-userconf/OPENUAS/openuas_control_panel.xml
\ No newline at end of file