diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.props b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.props
index 3160e28be0..11e640926b 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.props
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
-
-
- <_XamarinAppExtensionCommonPropsHasBeenImported>true
-
-
false
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.targets b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.targets
index 4ee1a61b39..560d2d2e2b 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.targets
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.Common.targets
@@ -21,8 +21,7 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.props b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.props
index e3ec8cc335..a2bf4759b3 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.props
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.props
@@ -19,13 +19,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
-
-
- <_XamarinCommonPropsHasBeenImported>true
-
-
-
+
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.props b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.props
index 468fac94fd..3403a22ec6 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.props
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.props
@@ -19,8 +19,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.props b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.props
index 043e15ddf5..df3bec139f 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.props
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
-
-
- <_XamarinCommonBindingPropsHasBeenImported>true
-
-
__UNIFIED__;__MACOS__;$(DefineConstants)
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.targets b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.targets
index 7e853415c3..78404cb0f4 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.targets
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.targets
@@ -15,8 +15,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
-->
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.props
index 7a999a3fbf..70e0390e11 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
-
-
- <_XamarinAppExtensionCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
index 0c6fae62a0..052e1469f7 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
@@ -28,8 +28,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.props
index 3e697d90c3..35b663ff47 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
-
- <_XamarinTVOSCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.targets
index 434cdf0093..c0a9da6d42 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.Common.targets
@@ -17,8 +17,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.props
index 7642cebddf..73d6c5df1d 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
-
- <_XamarinWatchOSAppCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets
index 0a7a3d852a..bda245abdb 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets
@@ -25,8 +25,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.props
index 22b9605f4d..85f0400cc8 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
-
- <_XamarinWatchOSAppExtensionCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
index 6d11fa05b8..8523a94531 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
@@ -32,8 +32,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.props
index 2e7ccc3522..df78204041 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.props
@@ -18,13 +18,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
-
- <_XamarinWatchOSCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.targets
index 373e32604d..8b05a26272 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.Common.targets
@@ -17,8 +17,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.props
index 194547c957..70e0390e11 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
-
-
- <_XamarinAppExtensionCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.targets
index fe66f26843..05467a0c3c 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.targets
@@ -23,8 +23,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
index 5e9e24fcf2..b720e10334 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
-
-
- <_XamarinCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
index fbd416321d..4a56926503 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
@@ -15,8 +15,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
-->
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.props
index d5ec91b705..315725ee13 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
-
-
- <_XamarinCommonPropsHasBeenImported>true
-
-
true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
index 6d5a3716c2..a4453622fe 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
@@ -15,8 +15,7 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
-->
-
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.props
index d4be5fa720..2b021bf2fb 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.props
@@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
-
- <_XamarinWatchAppCommonPropsHasBeenImported>true
-
-
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.targets
index 30dfac6ea9..bc09982ef0 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.Common.targets
@@ -25,8 +25,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
-
+