diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 05622a316..6be8471f2 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -2129,15 +2129,6 @@ METHOD(ike_sa_t, destroy, void,
 	free(this);
 }
 
-METHOD(ike_sa_t, initiate_xauth, void,
-			 private_ike_sa_t *this)
-{
-	xauth_request_t *xauth_request_task = xauth_request_create(this, TRUE);
-	this->task_manager->queue_task(this->task_manager, (task_t*)xauth_request_task);
-
-//	this->task_manager->initiate_later(this->task_manager);
-}
-
 /*
  * Described in header.
  */
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index ecfb04e02..2753fca1c 100644
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -958,11 +958,6 @@ struct ike_sa_t {
 	 * Destroys a ike_sa_t object.
 	 */
 	void (*destroy) (ike_sa_t *this);
-
-	/**
-	 * Initiate XAUTH authentication
-	 */
-	status_t (*initiate_xauth)(ike_sa_t *this);
 };
 
 /**
diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c
index fbc8da7cc..8bec310a7 100644
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/task_manager_v1.c
@@ -131,13 +131,6 @@ struct private_task_manager_t {
 	 * Base to calculate retransmission timeout
 	 */
 	double retransmit_base;
-
-	/**
-	 * Flag to tell the task manager to initiate a transaction at
-	 * a later time.
-	 */
-	bool initiate_later_flag;
-
 };
 
 /**