diff --git a/ChangeLog b/ChangeLog
index 005b209e81..2bce2f5547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-02  Dan Williams  <dcbw@redhat.com>
+
+	* Clean up unused variables and the like
+
 2005-02-02  Dan Williams  <dcbw@redhat.com>
 
 	* src/NetworkManagerAPList.c
diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index fd6719d37c..6bfda5d4bc 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -742,9 +742,6 @@ gboolean shutdown_callback (gpointer data)
 
 static DBusHandlerResult nmi_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
 {
-	char			*ap_path;
-	char			*dev_path;
-	DBusError		 error;
 	gboolean		 handled = FALSE;
 	NMIAppInfo	*info = (NMIAppInfo *) user_data;
 	gboolean		 appeared = FALSE;
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index cda57f222d..3c81b62720 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -512,7 +512,6 @@ static NMData *nm_data_new (gboolean enable_test_devices)
 	sigset_t block_mask;
 	NMData *data;
 	GSource *iosource;
-	GError *error = NULL;
 	
 	data = g_new0 (NMData, 1);
 
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 0591233b0f..f015b9c3e2 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -1090,7 +1090,6 @@ int nm_device_get_bitrate (NMDevice *dev)
 void nm_device_set_bitrate (NMDevice *dev, const int Mbps)
 {
 	int				sk;
-	int				err;
 	
 	g_return_if_fail (dev != NULL);
 	g_return_if_fail (nm_device_is_wireless (dev));
@@ -1651,7 +1650,6 @@ gboolean nm_device_set_mode (NMDevice *dev, const NMNetworkMode mode)
 void nm_device_activation_schedule_finish (NMDevice *dev, DeviceStatus activation_result)
 {
 	GSource			*source = NULL;
-	guint			 source_id = 0;
 	NMActivationResult	*result = NULL;
 
 	g_return_if_fail (dev != NULL);
@@ -1680,10 +1678,8 @@ void nm_device_activation_schedule_finish (NMDevice *dev, DeviceStatus activatio
  */
 gboolean nm_device_activation_schedule_start (NMDevice *dev)
 {
-	GError	*error = NULL;
 	NMData	*data = NULL;
 	GSource	*source = NULL;
-	guint	 source_id = 0;
 
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (!dev->activating, TRUE);	/* Return if activation has already begun */
@@ -1818,7 +1814,6 @@ static gboolean nm_device_wireless_wait_for_link (NMDevice *dev, const char *ess
 static gboolean nm_device_set_wireless_config (NMDevice *dev, NMAccessPoint *ap)
 {
 	NMDeviceAuthMethod	 auth;
-	gboolean			 success = FALSE;
 	const char		*essid = NULL;
 
 	g_return_val_if_fail (dev  != NULL, FALSE);
@@ -2191,7 +2186,6 @@ try_connect:
 
 	while (success == FALSE)
 	{
-		int			 ip_success = FALSE;
 		NMAccessPoint	*tmp_ap = NULL;
 		gboolean		 link = FALSE;
 		gboolean		 adhoc = (nm_ap_get_mode (best_ap) == NETWORK_MODE_ADHOC);
@@ -2364,7 +2358,6 @@ static gboolean nm_device_activate (gpointer user_data)
 	NMDevice			*dev = (NMDevice *)user_data;
 	gboolean			 success = FALSE;
 	gboolean			 finished = FALSE;
-	GMainContext		*context = NULL;
 
 	g_return_val_if_fail (dev  != NULL, FALSE);
 	g_return_val_if_fail (dev->app_data != NULL, FALSE);
@@ -2941,8 +2934,6 @@ static gboolean nm_device_wireless_force_use (NMDevice *dev, const char *essid,
 	gboolean			 encrypted = FALSE;
 	NMAccessPoint		*ap = NULL;
 	NMAccessPoint		*tmp_ap = NULL;
-	gboolean			 success = FALSE;
-	gboolean			 exists = FALSE;
 
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (dev->app_data != NULL, FALSE);
@@ -3442,7 +3433,6 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
 
 		if ((sk = iw_sockets_open ()) >= 0)
 		{
-			wireless_scan		*tmp_ap;
 			int				 err;
 			NMNetworkMode		 orig_mode = NETWORK_MODE_INFRA;
 			double			 orig_freq = 0;
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index e3849760e4..10666f0b65 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -44,7 +44,6 @@ GSList	*mutex_descs = NULL;
 static MutexDesc *nm_find_mutex_desc (GMutex *mutex)
 {
 	GSList	*elt;
-	gboolean	 found = FALSE;
 
 	for (elt = mutex_descs; elt; elt = g_slist_next (elt))
 	{
diff --git a/src/autoip.c b/src/autoip.c
index 218c2c05ef..92df4a369b 100644
--- a/src/autoip.c
+++ b/src/autoip.c
@@ -172,11 +172,9 @@ gboolean get_autoip (NMDevice *dev, struct in_addr *out_ip)
 {
 	struct sockaddr	saddr;
 	arpMessage		p;
-	struct ifreq		ifr;
 	struct ether_addr	addr;
 	struct in_addr		ip = {0};
 	int				fd;
-	int				timeout = 0;
 	int				nprobes = 0;
 	int				nannounce = 0;
 	gboolean			success = FALSE;