diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk
index f883b02..0e33a64 100644
--- a/core/legacy_prebuilts.mk
+++ b/core/legacy_prebuilts.mk
@@ -28,39 +28,24 @@
 	audio.conf \
 	auto_pairing.conf \
 	AVRCP.kl \
-	baseline11k.par \
-	baseline8k.par \
-	baseline.par \
-	basic.ok \
 	batch \
 	bitmap_size.txt \
 	blacklist.conf \
 	bmgr \
-	boolean.g2g \
 	bp.img \
 	brcm_guci_drv \
 	bypassfactory \
 	cdt.bin \
 	chat-ril \
-	cmu6plus.ok.zip \
 	content \
 	cpcap-key.kl \
 	data \
 	dbus.conf \
 	dev \
 	egl.cfg \
-	enroll.ok \
-	en-US-ttp.data \
 	firmware_error.565 \
 	firmware_install.565 \
 	ftmipcd \
-	generic11_f.swimdl \
-	generic11.lda \
-	generic11_m.swimdl \
-	generic8_f.swimdl \
-	generic8.lda \
-	generic8_m.swimdl \
-	generic.swiarb \
 	gps.conf \
 	gpsconfig.xml \
 	gps.stingray.so \
@@ -96,7 +81,6 @@
 	mdm_panicd \
 	monkey \
 	network.conf \
-	phone_type_choice.g2g \
 	pm \
 	pppd-ril \
 	pppd-ril.options \
@@ -118,7 +102,6 @@
 	ueventd.olympus.rc \
 	ueventd.rc \
 	ueventd.stingray.rc \
-	VoiceDialer.g2g \
 	vold.fstab \
 	wl1271.bin \
 	zoneinfo.dat \
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 22582a1..24f563d 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -67,7 +67,6 @@
 	cfassembler \
 	check_stack \
 	check_trace \
-	cmu2nuance \
 	com.android.phone.common \
 	com.android.vcard \
 	commons-compress-1.0 \
@@ -308,7 +307,6 @@
 	libSR_AcousticState \
 	libSR_AudioIn \
 	libSR_Core \
-	libsrec_jni \
 	libSR_EventLog \
 	libSR_G2P \
 	libSR_Grammar \