diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
index 5574991..4f0a151 100644
--- a/src/add-carddav-object.c
+++ b/src/add-carddav-object.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/add-carddav-object.h b/src/add-carddav-object.h
index 36b004e..191dbcd 100644
--- a/src/add-carddav-object.h
+++ b/src/add-carddav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/carddav-utils.c b/src/carddav-utils.c
index d255dea..3ebd5b3 100644
--- a/src/carddav-utils.c
+++ b/src/carddav-utils.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/carddav-utils.h b/src/carddav-utils.h
index 4d1822f..b517af5 100644
--- a/src/carddav-utils.h
+++ b/src/carddav-utils.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/carddav.c b/src/carddav.c
index 92e6362..a2520bc 100644
--- a/src/carddav.c
+++ b/src/carddav.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/carddav.h b/src/carddav.h
index f583ec9..59a05fa 100644
--- a/src/carddav.h
+++ b/src/carddav.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /**
  * @file carddav.h
  * @brief interface to the carddav library.
diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
index ec5ef5a..07363c7 100644
--- a/src/delete-carddav-object.c
+++ b/src/delete-carddav-object.c
@@ -1,4 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/delete-carddav-object.h b/src/delete-carddav-object.h
index 82f8901..d5a90ae 100644
--- a/src/delete-carddav-object.h
+++ b/src/delete-carddav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
index c88a9ae..fffef72 100644
--- a/src/get-carddav-report.c
+++ b/src/get-carddav-report.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4 smarttab: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
@@ -378,4 +376,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
 	curl_easy_cleanup(curl);
 	g_free(dav_file_listing);
 	return result;
-}
\ No newline at end of file
+}
diff --git a/src/get-carddav-report.h b/src/get-carddav-report.h
index 53f75f5..9dc3eac 100644
--- a/src/get-carddav-report.h
+++ b/src/get-carddav-report.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/get-display-name.c b/src/get-display-name.c
index 9e782e0..21d5c86 100644
--- a/src/get-display-name.c
+++ b/src/get-display-name.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4 smarttab: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/get-display-name.h b/src/get-display-name.h
index 739a638..5a94e10 100644
--- a/src/get-display-name.h
+++ b/src/get-display-name.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
index 163264c..a3cd072 100644
--- a/src/lock-carddav-object.c
+++ b/src/lock-carddav-object.c
@@ -1,4 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/lock-carddav-object.h b/src/lock-carddav-object.h
index 915f283..2d09e93 100644
--- a/src/lock-carddav-object.h
+++ b/src/lock-carddav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
index 81d4602..1ff4013 100644
--- a/src/modify-carddav-object.c
+++ b/src/modify-carddav-object.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/modify-carddav-object.h b/src/modify-carddav-object.h
index f172a45..8057718 100644
--- a/src/modify-carddav-object.h
+++ b/src/modify-carddav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
index b774401..b533375 100644
--- a/src/options-carddav-server.c
+++ b/src/options-carddav-server.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
diff --git a/src/options-carddav-server.h b/src/options-carddav-server.h
index 7b79e6f..d0bd260 100644
--- a/src/options-carddav-server.h
+++ b/src/options-carddav-server.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2010 Timothy Pearson (kb9vqf@pearsoncomputing.net)
  * Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *