diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index fee67653a2f..f45e588eb1c 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -765,8 +765,6 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 		context->conn = call->conn;
 		context->iface = iface;
 		context->context_id = context_id;
-		/* legacy for openchange dcesrv_mapiproxy.c */
-		context->assoc_group = call->conn->assoc_group;
 		context->private_data = NULL;
 		DLIST_ADD(call->conn->contexts, context);
 		call->context = context;
@@ -984,8 +982,6 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint16_
 	context->conn = call->conn;
 	context->iface = iface;
 	context->context_id = context_id;
-	/* legacy for openchange dcesrv_mapiproxy.c */
-	context->assoc_group = call->conn->assoc_group;
 	context->private_data = NULL;
 	DLIST_ADD(call->conn->contexts, context);
 	call->context = context;
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index ef51dac40f4..2dec40e0c9c 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -175,9 +175,6 @@ struct dcesrv_connection_context {
 	struct dcesrv_connection_context *next, *prev;
 	uint16_t context_id;
 
-	/* TODO: remove this legacy (for openchange) in master */
-	struct dcesrv_assoc_group *assoc_group;
-
 	/* the connection this is on */
 	struct dcesrv_connection *conn;