diff --git a/ChangeLog b/ChangeLog
index 648b5706b..4f19d0fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2007-02-12  Tambet Ingo  <tambet@ximian.com>
 
+	* libnm-glib/nm-device.c (nm_device_get_use_dhcp): Remove.
+
+	* libnm-glib/nm-access-point.c (nm_access_point_is_broadcast): Remove.
+
+	* introspection/nm-device-802-3-ethernet.xml: Rename 'Address' property to
+	'HwAddress'.
+
+	* introspection/nm-device.xml: Remove 'UseDhcp' property.
+
+	* introspection/nm-access-point.xml: Remove 'Broadcast' property.
+
 	Totally break NetworkManager. Please use 0.6 branch until futher notice.
 
 	* src/:
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index d87aa7633..357f1d7ad 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -3,7 +3,6 @@
 <node name="/">
   <interface name="org.freedesktop.NetworkManager.AccessPoint">
     <property name="Address" type="s" access="read"/>
-    <property name="Broadcast" type="b" access="read"/>
     <property name="Capabilities" type="i" access="read"/>
     <property name="Encrypted" type="b" access="read"/>
     <property name="Essid" type="s" access="read"/>
diff --git a/introspection/nm-device-802-3-ethernet.xml b/introspection/nm-device-802-3-ethernet.xml
index f9151cfb6..99d44a12b 100644
--- a/introspection/nm-device-802-3-ethernet.xml
+++ b/introspection/nm-device-802-3-ethernet.xml
@@ -7,7 +7,7 @@
       <arg name="user_requested" type="b"/>
     </method>
 
-    <property name="Address" type="s" access="read"/>
+    <property name="HwAddress" type="s" access="read"/>
     <property name="Speed" type="i" access="read"/>
   </interface>
 </node>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index a84c497b3..20c033ed9 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -11,7 +11,6 @@
     <property name="Driver" type="s" access="read"/>
     <property name="Capabilities" type="i" access="read"/>
     <property name="Ip4Address" type="i" access="read"/>
-    <property name="UseDhcp" type="b" access="read"/>
     <property name="State" type="u" access="read"/>
 
     <!-- Ugh, but I see no other way of getting the type on the caller
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index bd3a57379..a03b3a206 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -54,9 +54,6 @@ dump_device (NMDevice *device)
 	g_print ("Driver: %s\n", str);
 	g_free (str);
 
-	b = nm_device_get_use_dhcp (device);
-	g_print ("Use DHCP: %s\n", b ? "yes" : "no");
-
 	u = nm_device_get_ip4_address (device);
 	g_print ("IP address: %d\n", u);
 
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 74987ba33..320b1121c 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -43,23 +43,6 @@ nm_access_point_get_address (NMAccessPoint *ap)
 	return address;
 }
 
-gboolean
-nm_access_point_is_broadcast (NMAccessPoint *ap)
-{
-	GValue value = {0,};
-	int broadcast = FALSE;
-
-	g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), FALSE);
-
-	if (nm_dbus_get_property (DBUS_G_PROXY (ap),
-							  NM_DBUS_INTERFACE_ACCESS_POINT,
-							  "Broadcast",
-							  &value))
-		broadcast = g_value_get_boolean (&value);
-
-	return broadcast;
-}
-
 int
 nm_access_point_get_capabilities (NMAccessPoint *ap)
 {
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h
index 63166b139..13c626e4d 100644
--- a/libnm-glib/nm-access-point.h
+++ b/libnm-glib/nm-access-point.h
@@ -25,7 +25,6 @@ GType nm_access_point_get_type (void);
 NMAccessPoint *nm_access_point_new (DBusGConnection *connection, const char *path);
 
 char     *nm_access_point_get_address      (NMAccessPoint *ap);
-gboolean  nm_access_point_is_broadcast     (NMAccessPoint *ap);
 int       nm_access_point_get_capabilities (NMAccessPoint *ap);
 gboolean  nm_access_point_is_encrypted     (NMAccessPoint *ap);
 char     *nm_access_point_get_essid        (NMAccessPoint *ap);
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index ab18be194..6fd5e6892 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -147,23 +147,6 @@ nm_device_get_driver (NMDevice *device)
 	return driver;
 }
 
-gboolean
-nm_device_get_use_dhcp (NMDevice *device)
-{
-	gboolean dhcp = FALSE;
-	GValue value = {0,};
-
-	g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
-
-	if (nm_dbus_get_property (DBUS_G_PROXY (device),
-							  NM_DBUS_INTERFACE_DEVICE,
-							  "UseDhcp",
-							  &value))
-		dhcp = g_value_get_boolean (&value);
-
-	return dhcp;
-}
-
 guint32
 nm_device_get_ip4_address (NMDevice *device)
 {
diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h
index a135a575b..dcdaf9a88 100644
--- a/libnm-glib/nm-device.h
+++ b/libnm-glib/nm-device.h
@@ -33,7 +33,6 @@ void      nm_device_deactivate (NMDevice *device);
 char     *nm_device_get_iface (NMDevice *device);
 char     *nm_device_get_udi (NMDevice *device);
 char     *nm_device_get_driver (NMDevice *device);
-gboolean  nm_device_get_use_dhcp (NMDevice *device);
 guint32   nm_device_get_ip4_address (NMDevice *device);
 NMDeviceState nm_device_get_state (NMDevice *device);