diff --git a/Kbuild b/Kbuild
index 8366bc9a400a..5b586e548d90 100644
--- a/Kbuild
+++ b/Kbuild
@@ -765,7 +765,6 @@ CDS_INC := 	-I$(WLAN_ROOT)/$(CDS_INC_DIR) \
 
 CDS_OBJS :=	$(CDS_SRC_DIR)/cds_api.o \
 		$(CDS_SRC_DIR)/cds_reg_service.o \
-		$(CDS_SRC_DIR)/cds_mq.o \
 		$(CDS_SRC_DIR)/cds_packet.o \
 		$(CDS_SRC_DIR)/cds_regdomain.o \
 		$(CDS_SRC_DIR)/cds_sched.o \
diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h
deleted file mode 100644
index f6049b5a45bd..000000000000
--- a/core/cds/inc/cds_mq.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-#if !defined(__CDS_MQ_H)
-#define __CDS_MQ_H
-
-/**=========================================================================
-
-   \file  cds_mq.h
-
-   \brief virtual Operating System Services (QDF) message queue APIs
-
-   Message Queue Definitions and API
-
-   ========================================================================*/
-
-/*--------------------------------------------------------------------------
-   Include Files
-   ------------------------------------------------------------------------*/
-#include <qdf_types.h>
-#include <qdf_status.h>
-
-/**---------------------------------------------------------------------------
-
-   \brief cds_send_mb_message_to_mac() - post a message to a message queue
-
-   \param pBuf is a buffer allocated by caller. The actual structure varies
-   base on message type
-
-   \return QDF_STATUS_SUCCESS - the message has been successfully posted
-   to the message queue.
-
-   QDF_STATUS_E_FAILURE - the message queue handler has reported
-   an unknown failure.
-
-   \sa
-   --------------------------------------------------------------------------*/
-
-
-#endif /* if !defined __CDS_MQ_H */
diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c
deleted file mode 100644
index 04546b10e9ae..000000000000
--- a/core/cds/src/cds_mq.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
- * DOC: cds_mq.c
- *
- * Connectivity driver services (CDS) message queue APIs
- *
- * Message Queue Definitions and API
- */
-
-/* Include Files */
-#include "cds_sched.h"
-#include <cds_api.h>
-#include "sir_types.h"
-
-/* Preprocessor definitions and constants */
-
-/* Type declarations */
-
-/* Function declarations and documenation */
-