diff --git a/src/agent.c b/src/agent.c
index 6c743f6..823ce31 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -72,13 +72,10 @@ typedef enum {
 
 struct agent {
 	int ref;
-	struct btd_adapter *adapter;
 	char *owner;
 	char *path;
 	uint8_t capability;
 	struct agent_request *request;
-	agent_remove_cb remove_cb;
-	void *remove_cb_data;
 	guint watch;
 };
 
@@ -178,9 +175,6 @@ void agent_unref(struct agent *agent)
 	if (agent == default_agent)
 		default_agent = NULL;
 
-	if (agent->remove_cb)
-		agent->remove_cb(agent, agent->remove_cb_data);
-
 	if (agent->request) {
 		DBusError err;
 		agent_pincode_cb pincode_cb;
@@ -233,20 +227,16 @@ struct agent *agent_get(const char *owner)
 	return NULL;
 }
 
-struct agent *agent_create(struct btd_adapter *adapter, const char *name,
-				const char *path, uint8_t capability,
-				agent_remove_cb cb, void *remove_cb_data)
+static struct agent *agent_create( const char *name, const char *path,
+							uint8_t capability)
 {
 	struct agent *agent;
 
 	agent = g_new0(struct agent, 1);
 
-	agent->adapter = adapter;
 	agent->owner = g_strdup(name);
 	agent->path = g_strdup(path);
 	agent->capability = capability;
-	agent->remove_cb = cb;
-	agent->remove_cb_data = remove_cb_data;
 
 	agent->watch = g_dbus_add_disconnect_watch(btd_get_dbus_connection(),
 							name, agent_disconnect,
@@ -924,7 +914,7 @@ static DBusMessage *register_agent(DBusConnection *conn,
 
 	cap = parse_io_capability(capability);
 
-	agent = agent_create(NULL, sender, path, cap, NULL, NULL);
+	agent = agent_create(sender, path, cap);
 	if (!agent)
 		return btd_error_invalid_args(msg);
 
diff --git a/src/agent.h b/src/agent.h
index 9e70aa8..4f0357b 100644
--- a/src/agent.h
+++ b/src/agent.h
@@ -33,12 +33,6 @@ typedef void (*agent_pincode_cb) (struct agent *agent, DBusError *err,
 typedef void (*agent_passkey_cb) (struct agent *agent, DBusError *err,
 					uint32_t passkey, void *user_data);
 
-typedef void (*agent_remove_cb) (struct agent *agent, void *user_data);
-
-struct agent *agent_create(struct btd_adapter *adapter, const char *name,
-				const char *path, uint8_t capability,
-				agent_remove_cb cb, void *remove_cb_data);
-
 struct agent *agent_ref(struct agent *agent);
 void agent_unref(struct agent *agent);