diff --git a/icwmp/Config_datamodel.in b/icwmp/Config_datamodel.in
index 9ba78bfb1..b652fae3c 100755
--- a/icwmp/Config_datamodel.in
+++ b/icwmp/Config_datamodel.in
@@ -1,14 +1,4 @@
 if PACKAGE_libdatamodel
-choice
-	prompt "Select Data Model"
-	default tr098
-
-config DATAMODEL_TR098
-	bool "TR-098"
-
-config DATAMODEL_TR181
-	bool "TR-181"
-endchoice
 
 config UPNP_TR064
 	bool "Compile with tr064 features"
diff --git a/icwmp/Makefile b/icwmp/Makefile
index 3609dd574..fb1047561 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -111,9 +111,7 @@ ifeq ($(CONFIG_XMPP_ENABLE),y)
 CONFIGURE_ARGS += \
 	--enable-xmpp
 endif
-
-CONFIGURE_ARGS += $(if $(CONFIG_DATAMODEL_TR181),--enable-datamodel=tr181,--enable-datamodel=tr098)
-
+	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \