diff --git a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_Bootstrap/dotNetMF.proj b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_Bootstrap/dotNetMF.proj
index 1a5e716f9..5a1842f63 100644
--- a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_Bootstrap/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_Bootstrap/dotNetMF.proj
@@ -51,11 +51,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
-  
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_I2C/dotNetMF.proj b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_I2C/dotNetMF.proj
index d764186e7..e77d2de56 100644
--- a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_I2C/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_I2C/dotNetMF.proj
@@ -51,9 +51,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_IntC/dotNetMF.proj b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_IntC/dotNetMF.proj
index f8d745cf3..6065f247a 100644
--- a/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_IntC/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32/DeviceCode/STM32_IntC/dotNetMF.proj
@@ -51,9 +51,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Bootstrap/dotNetMF.proj b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Bootstrap/dotNetMF.proj
index dc1a5a94e..2cafc9d8d 100644
--- a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Bootstrap/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Bootstrap/dotNetMF.proj
@@ -65,11 +65,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
-  
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_I2C/dotNetMF.proj b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_I2C/dotNetMF.proj
index ac2be2d95..4e4bf962c 100644
--- a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_I2C/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_I2C/dotNetMF.proj
@@ -65,9 +65,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_IntC/dotNetMF.proj b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_IntC/dotNetMF.proj
index 4c85fb102..81a015c4d 100644
--- a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_IntC/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_IntC/dotNetMF.proj
@@ -65,9 +65,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_SPI/dotNetMF.proj b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_SPI/dotNetMF.proj
index 0735f2536..d3715412c 100644
--- a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_SPI/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_SPI/dotNetMF.proj
@@ -65,9 +65,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_security/dotNetMF.proj b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_security/dotNetMF.proj
index ecbea7fb7..b0cb3b730 100644
--- a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_security/dotNetMF.proj
+++ b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_security/dotNetMF.proj
@@ -65,9 +65,6 @@
     <PlatformIndependentBuild>false</PlatformIndependentBuild>
     <Version>4.0.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup>
-    <ARMBUILD_ONLY>true</ARMBUILD_ONLY>
-  </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <PropertyGroup />
   <ItemGroup>
diff --git a/tools/Targets/Microsoft.Spot.system.gcc.targets b/tools/Targets/Microsoft.Spot.system.gcc.targets
index 20f2b19e2..e426a33c6 100644
--- a/tools/Targets/Microsoft.Spot.system.gcc.targets
+++ b/tools/Targets/Microsoft.Spot.system.gcc.targets
@@ -140,7 +140,6 @@
     <CC_CPP_COMMON_FLAGS Condition="'$(INSTRUCTION_SET)'=='thumb'">$(CC_CPP_COMMON_FLAGS) -mthumb-interwork -DCOMPILE_THUMB </CC_CPP_COMMON_FLAGS>
     <CC_CPP_COMMON_FLAGS Condition="'$(INSTRUCTION_SET)'=='thumb2'"  >$(CC_CPP_COMMON_FLAGS) -DCOMPILE_THUMB2 -mthumb</CC_CPP_COMMON_FLAGS>
     <CC_CPP_COMMON_FLAGS Condition="'$(INSTRUCTION_SET)'=='thumb2fp'">$(CC_CPP_COMMON_FLAGS) -DCOMPILE_THUMB2 -mthumb</CC_CPP_COMMON_FLAGS>
-    <CC_CPP_COMMON_FLAGS Condition="'$(INSTRUCTION_SET)'=='thumb' and '$(ARMBUILD_ONLY)'!='true' "   >$(CC_CPP_COMMON_FLAGS) -mthumb </CC_CPP_COMMON_FLAGS>    
 
     <CC_CPP_COMMON_FLAGS Condition="'$(FLAVOR)'=='Instrumented' and '$(NATIVE_PROFILE_CLR)'!=''">$(CC_CPP_COMMON_FLAGS) -DNATIVE_PROFILE_CLR=$(NATIVE_PROFILE_CLR)</CC_CPP_COMMON_FLAGS>
     <CC_CPP_COMMON_FLAGS Condition="'$(FLAVOR)'=='Instrumented' and '$(NATIVE_PROFILE_PAL)'!=''">$(CC_CPP_COMMON_FLAGS) -DNATIVE_PROFILE_PAL=$(NATIVE_PROFILE_PAL)</CC_CPP_COMMON_FLAGS>