diff --git a/configure.ac b/configure.ac
index 3d0028230..1dd79e880 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,6 @@ AC_OUTPUT(
     src/libmsc/Makefile
     src/libvlr/Makefile
     src/libgsupclient/Makefile
-    src/libcommon-cs/Makefile
     src/osmo-msc/Makefile
     src/utils/Makefile
     tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 32bd4d79b..2322adea4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,6 @@ SUBDIRS = \
 	libgsupclient \
 	libvlr \
 	libmsc \
-	libcommon-cs \
 	$(NULL)
 
 # Programs
diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am
deleted file mode 100644
index 10608ab88..000000000
--- a/src/libcommon-cs/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_CPPFLAGS = \
-	$(all_includes) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir) \
-	$(NULL)
-
-AM_CFLAGS = \
-	-Wall \
-	$(LIBOSMOCORE_CFLAGS) \
-	$(LIBOSMOGSM_CFLAGS) \
-	$(LIBOSMOVTY_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
-	$(LIBOSMOSCCP_CFLAGS) \
-	$(LIBOSMOMGCPCLIENT_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(NULL)
-
-noinst_LIBRARIES = libcommon-cs.a
-
-libcommon_cs_a_SOURCES = \
-	common_cs.c
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
deleted file mode 100644
index 5312468ca..000000000
--- a/src/libcommon-cs/common_cs.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC").
- *
- * (C) 2016 by sysmocom s.m.f.c. <info@sysmocom.de>
- * (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
- * (C) 2014 by Holger Hans Peter Freyther
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdbool.h>
-
-#include <osmocom/gsm/gsm0480.h>
-
-#include <osmocom/msc/common_cs.h>
-#include <osmocom/msc/gsm_data.h>
-#include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/gsm_data.h>
-#include <osmocom/msc/gsm_04_11.h>
-#include <osmocom/msc/gsm_04_08.h>
-
diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am
index 1618fb54a..42bc69fe0 100644
--- a/src/osmo-msc/Makefile.am
+++ b/src/osmo-msc/Makefile.am
@@ -34,7 +34,6 @@ osmo_msc_SOURCES = \
 osmo_msc_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
-	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(top_builddir)/src/libgsupclient/libgsupclient.a \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am
index d6b162218..249a873a9 100644
--- a/tests/db/Makefile.am
+++ b/tests/db/Makefile.am
@@ -33,7 +33,6 @@ db_test_SOURCES = \
 
 db_test_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
-	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(top_builddir)/src/libtrau/libtrau.a \
 	$(top_builddir)/tests/libiudummy/libiudummy.a \
 	$(LIBOSMOCORE_LIBS) \
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index ab2139be4..bafe743e8 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -38,7 +38,6 @@ AM_LDFLAGS = \
 
 LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
-	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
 	$(top_builddir)/src/libgsupclient/libgsupclient.a \
 	$(LIBSMPP34_LIBS) \
diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am
index 02bc3f207..61b8515d8 100644
--- a/tests/sms_queue/Makefile.am
+++ b/tests/sms_queue/Makefile.am
@@ -33,7 +33,6 @@ sms_queue_test_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
 	$(top_builddir)/src/libgsupclient/libgsupclient.a \
-	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(LIBSMPP34_LIBS) \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \