diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index a2f214388b53..2e999916dbd7 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -12,9 +12,6 @@
 #include <sound/soc.h>
 #include <sound/simple_card_utils.h>
 
-/* REMOVE ME */
-#define asoc_simple_card_info	simple_util_info
-
 struct simple_util_info {
 	const char *name;
 	const char *card;
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 0639c6df15e3..18e7a0b89395 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -11,22 +11,11 @@
 #include <linux/clk.h>
 #include <sound/soc.h>
 
-/* REMOVE ME */
-#define asoc_simple_init_hp	simple_util_init_hp
-#define asoc_simple_init_mic	simple_util_init_mic
-
 #define simple_util_init_hp(card, sjack, prefix)		\
 	simple_util_init_jack(card, sjack, 1, prefix, NULL)
 #define simple_util_init_mic(card, sjack, prefix)		\
 	simple_util_init_jack(card, sjack, 0, prefix, NULL)
 
-/* REMOVE ME */
-#define asoc_simple_tdm_width_map	simple_util_tdm_width_map
-#define asoc_simple_dai			simple_util_dai
-#define asoc_simple_data		simple_util_data
-#define asoc_simple_jack		simple_util_jack
-#define asoc_simple_priv		simple_util_priv
-
 struct simple_util_tdm_width_map {
 	u8 sample_bits;
 	u8 slot_count;
@@ -141,35 +130,6 @@ struct link_info {
 	struct prop_nums num[SNDRV_MAX_LINKS];
 };
 
-/* REMOVE ME */
-#define asoc_simple_parse_daifmt		simple_util_parse_daifmt
-#define asoc_simple_parse_tdm_width_map		simple_util_parse_tdm_width_map
-#define asoc_simple_set_dailink_name		simple_util_set_dailink_name
-#define asoc_simple_parse_card_name		simple_util_parse_card_name
-#define asoc_simple_parse_clk			simple_util_parse_clk
-#define asoc_simple_startup			simple_util_startup
-#define asoc_simple_shutdown			simple_util_shutdown
-#define asoc_simple_hw_params			simple_util_hw_params
-#define asoc_simple_dai_init			simple_util_dai_init
-#define asoc_simple_be_hw_params_fixup		simple_util_be_hw_params_fixup
-#define asoc_simple_parse_tdm			simple_util_parse_tdm
-#define asoc_simple_canonicalize_platform	simple_util_canonicalize_platform
-#define asoc_simple_canonicalize_cpu		simple_util_canonicalize_cpu
-#define asoc_simple_clean_reference		simple_util_clean_reference
-#define asoc_simple_parse_convert		simple_util_parse_convert
-#define asoc_simple_is_convert_required		simple_util_is_convert_required
-#define asoc_simple_parse_routing		simple_util_parse_routing
-#define asoc_simple_parse_widgets		simple_util_parse_widgets
-#define asoc_simple_parse_pin_switches		simple_util_parse_pin_switches
-#define asoc_simple_init_jack			simple_util_init_jack
-#define asoc_simple_init_aux_jacks		simple_util_init_aux_jacks
-#define asoc_simple_init_priv			simple_util_init_priv
-#define asoc_simple_remove			simple_util_remove
-#define asoc_simple_debug_info			simple_util_debug_info
-#define asoc_graph_card_probe			graph_util_card_probe
-#define asoc_graph_is_ports0			graph_util_is_ports0
-#define asoc_graph_parse_dai			graph_util_parse_dai
-
 int simple_util_parse_daifmt(struct device *dev,
 			     struct device_node *node,
 			     struct device_node *codec,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 45e005abe03b..63b57f58cc56 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -775,11 +775,6 @@ struct snd_soc_dai_link {
 #endif
 };
 
-/* REMOVE ME */
-#define asoc_link_to_cpu	snd_soc_link_to_cpu
-#define asoc_link_to_codec	snd_soc_link_to_codec
-#define asoc_link_to_platform	snd_soc_link_to_platform
-
 static inline struct snd_soc_dai_link_component*
 snd_soc_link_to_cpu(struct snd_soc_dai_link *link, int n) {
 	return &(link)->cpus[n];
@@ -896,9 +891,6 @@ snd_soc_link_to_platform(struct snd_soc_dai_link *link, int n) {
 #define COMP_CODEC_CONF(_name)		{ .name = _name }
 #define COMP_DUMMY()			{ .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", }
 
-/* REMOVE ME */
-#define asoc_dummy_dlc		snd_soc_dummy_dlc
-
 extern struct snd_soc_dai_link_component null_dailink_component[0];
 extern struct snd_soc_dai_link_component snd_soc_dummy_dlc;
 
@@ -1146,11 +1138,6 @@ struct snd_soc_pcm_runtime {
 	struct snd_soc_component *components[]; /* CPU/Codec/Platform */
 };
 
-/* REMOVE ME */
-#define asoc_rtd_to_cpu		snd_soc_rtd_to_cpu
-#define asoc_rtd_to_codec	snd_soc_rtd_to_codec
-#define asoc_substream_to_rtd	snd_soc_substream_to_rtd
-
 /* see soc_new_pcm_runtime()  */
 #define snd_soc_rtd_to_cpu(rtd, n)   (rtd)->dais[n]
 #define snd_soc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->dai_link->num_cpus]