diff --git a/ChangeLog b/ChangeLog
index 77d6a4acf9a82d76498747b79625a89487681cfb..ab798e901bfc62eeb5f18c441c3887b2d15bb688 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 22 16:17:25 IST 2007 Mark McLoughlin <markmc@redhat.com>
+
+	* src/driver.h: remove Free(), GetName(), GetID() and
+	GetUUID() driver methods.
+
+	* src/proxy_internal.c,	src/test.c, src/xen_internal.c,
+	src/xend_internal.c, src/xm_internal.c,	src/xs_internal.c:
+	Update driver vtables.
+
 Mon Jan 22 16:24:54 CET 2007 Daniel Veillard <veillard@redhat.com>
 
 	* configure.in libvirt.spec.in docs/*.html include/libvirt/libvirt.h:
diff --git a/src/driver.h b/src/driver.h
index 9027ff985bee9df055a7cafe2ab52ee5aca3aa09..4e708a3a9f4dc5936f1286a7a9d0846fcb7570e9 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -77,15 +77,6 @@ typedef int
 					 unsigned int flags);
 typedef int
 	(*virDrvDomainDestroy)		(virDomainPtr domain);
-typedef int
-	(*virDrvDomainFree)		(virDomainPtr domain);
-typedef const char *
-	(*virDrvDomainGetName)		(virDomainPtr domain);
-typedef int
-	(*virDrvDomainGetID)		(virDomainPtr domain);
-typedef int
-	(*virDrvDomainGetUUID)		(virDomainPtr domain,
-					 unsigned char *uuid);
 typedef char *
 	(*virDrvDomainGetOSType)	(virDomainPtr domain);
 typedef unsigned long
@@ -175,10 +166,6 @@ struct _virDriver {
 	virDrvDomainShutdown		domainShutdown;
 	virDrvDomainReboot		domainReboot;
 	virDrvDomainDestroy		domainDestroy;
-	virDrvDomainFree		domainFree;
-	virDrvDomainGetName		domainGetName;
-	virDrvDomainGetID		domainGetID;
-	virDrvDomainGetUUID		domainGetUUID;
 	virDrvDomainGetOSType		domainGetOSType;
 	virDrvDomainGetMaxMemory	domainGetMaxMemory;
 	virDrvDomainSetMaxMemory	domainSetMaxMemory;
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index aade2308c12073520f46923d808d41612b7ada7c..4f6a87cf518793d866d317938cbf5ba510ddc342 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -63,10 +63,6 @@ static virDriver xenProxyDriver = {
     NULL, /* domainShutdown */
     NULL, /* domainReboot */
     NULL, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     xenProxyDomainGetOSType, /* domainGetOSType */
     xenProxyDomainGetMaxMemory, /* domainGetMaxMemory */
     NULL, /* domainSetMaxMemory */
diff --git a/src/test.c b/src/test.c
index eef629ca566b7e1628fbc4a72250d51ac7e1c25b..1745c1495fcbf385aa44f92e9b81df84d2cff532 100644
--- a/src/test.c
+++ b/src/test.c
@@ -107,10 +107,6 @@ static virDriver testDriver = {
     testShutdownDomain, /* domainShutdown */
     testRebootDomain, /* domainReboot */
     testDestroyDomain, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     testGetOSType, /* domainGetOSType */
     testGetMaxMemory, /* domainGetMaxMemory */
     testSetMaxMemory, /* domainSetMaxMemory */
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 2e79704b9bf7be07ae36c50ce83bfb99ee3f20e3..8e374bb6d101e68ba997497e85dcf6a3a61daf42 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -437,10 +437,6 @@ static virDriver xenHypervisorDriver = {
     NULL, /* domainShutdown */
     NULL, /* domainReboot */
     xenHypervisorDestroyDomain, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     NULL, /* domainGetOSType */
     xenHypervisorGetMaxMemory, /* domainGetMaxMemory */
     xenHypervisorSetMaxMemory, /* domainSetMaxMemory */
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 64b9c9750feab8fb23c51b9267fe388dba24d7d9..cc05faa8bc2eb536c6509caeb5c6f142cbc54bae 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -79,10 +79,6 @@ static virDriver xenDaemonDriver = {
     xenDaemonDomainShutdown, /* domainShutdown */
     xenDaemonDomainReboot, /* domainReboot */
     xenDaemonDomainDestroy, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     NULL, /* domainGetOSType */
     xenDaemonDomainGetMaxMemory, /* domainGetMaxMemory */
     xenDaemonDomainSetMaxMemory, /* domainSetMaxMemory */
diff --git a/src/xm_internal.c b/src/xm_internal.c
index e60fd1827e8cc9a26e1255e354725d50df1a434c..54db533b46d293c276acb59d57cf7734200837ff 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -86,10 +86,6 @@ static virDriver xenXMDriver = {
     NULL, /* domainShutdown */
     NULL, /* domainReboot */
     NULL, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     NULL, /* domainGetOSType */
     xenXMDomainGetMaxMemory, /* domainGetMaxMemory */
     xenXMDomainSetMaxMemory, /* domainSetMaxMemory */
diff --git a/src/xs_internal.c b/src/xs_internal.c
index 70ef0c770f1d0bf98e5beda9060a5670803d1f35..0bf83ba24179991b12254786e49277adb5b755b7 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -57,10 +57,6 @@ static virDriver xenStoreDriver = {
     xenStoreDomainShutdown, /* domainShutdown */
     xenStoreDomainReboot, /* domainReboot */
     NULL, /* domainDestroy */
-    NULL, /* domainFree */
-    NULL, /* domainGetName */
-    NULL, /* domainGetID */
-    NULL, /* domainGetUUID */
     xenStoreDomainGetOSType, /* domainGetOSType */
     xenStoreDomainGetMaxMemory, /* domainGetMaxMemory */
     NULL, /* domainSetMaxMemory */