Removal of NET_1_1 defines and some NET_2_0; Both defines are true these days in Mono, no versions prior to 2.0 are supported

141 files changed, 68 insertions, 1220 deletions

diff --git a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
index ae046c851ad..82a24e7fa83 100644
--- a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
@@ -62,17 +62,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ImportedFromTypeLib ("Accessibility")]
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: TypeLibVersion (1, 1)]
-	[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-#elif NET_1_1
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-	[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-	[assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: TypeLibVersion (1, 1)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml.XPath/XPathNavigatorReader.cs b/mcs/class/Mono.Xml.Ext/Mono.Xml.XPath/XPathNavigatorReader.cs
index 6fa769aa35f..8beb07d8d1b 100644
--- a/mcs/class/Mono.Xml.Ext/Mono.Xml.XPath/XPathNavigatorReader.cs
+++ b/mcs/class/Mono.Xml.Ext/Mono.Xml.XPath/XPathNavigatorReader.cs
@@ -543,108 +543,6 @@ namespace Mono.Xml.XPath
 			return ret;

 		}

 

-#if NET_1_1

-#else

-		public override string ReadInnerXml ()

-		{

-			if (ReadState != ReadState.Interactive)

-				return String.Empty;

-

-			switch (NodeType) {

-			case XmlNodeType.Attribute:

-				return Value;

-			case XmlNodeType.Element:

-				if (IsEmptyElement)

-					return String.Empty;

-

-				int startDepth = Depth;

-

-				innerXmlBuilder.Length = 0;

-				bool loop = true;

-				do {

-					Read ();

-					if (NodeType ==XmlNodeType.None)

-						throw new InvalidOperationException ("unexpected end of xml.");

-					else if (NodeType == XmlNodeType.EndElement && Depth == startDepth) {

-						loop = false;

-						Read ();

-					}

-					else

-						innerXmlBuilder.Append (GetCurrentTagMarkup ());

-				} while (loop);

-				string xml = innerXmlBuilder.ToString ();

-				innerXmlBuilder.Length = 0;

-				return xml;

-			case XmlNodeType.None:

-				// MS document is incorrect. Seems not to progress.

-				return String.Empty;

-			default:

-				Read ();

-				return String.Empty;

-			}

-		}

-		

-		StringBuilder atts = new StringBuilder ();

-		private string GetCurrentTagMarkup ()

-		{

-			switch (NodeType) {

-			case XmlNodeType.CDATA:

-				return String.Format ("<![CDATA[{0}]]>", Value.Replace ("]]>", "]]&gt;"));

-			case XmlNodeType.Text:

-				return Value.Replace ("<", "&lt;");

-			case XmlNodeType.Comment:

-				return String.Format ("<!--{0}-->", Value);

-			case XmlNodeType.SignificantWhitespace:

-			case XmlNodeType.Whitespace:

-				return Value;

-			case XmlNodeType.EndElement:

-				return String.Format ("</{0}>", Name);

-			}

-

-			bool isEmpty = IsEmptyElement;

-			string name = Name;

-			atts.Length = 0;

-			XPathNavigator temp = current.Clone ();

-			while (temp.MoveToNextAttribute ())

-				atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));

-			if (!IsEmptyElement)

-				return String.Format ("<{0}{1}>", name, atts);

-			else

-				return String.Format ("<{0}{1} />", name, atts);

-		}

-

-		// Arranged copy of XmlTextReader.ReadOuterXml()

-		public override string ReadOuterXml ()

-		{

-			if (ReadState != ReadState.Interactive)

-				return String.Empty;

-

-			switch (NodeType) {

-			case XmlNodeType.Attribute:

-				// strictly incompatible with MS... (it holds spaces attribute between name, value and "=" char (very trivial).

-				return String.Format ("{0}={1}{2}{1}", Name, QuoteChar, ReadInnerXml ());

-			case XmlNodeType.Element:

-				bool isEmpty = IsEmptyElement;

-				string name = Name;

-				StringBuilder atts = new StringBuilder ();

-				XPathNavigator temp = current.Clone ();

-				while (temp.MoveToNextAttribute ())

-					atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));

-

-				if (!isEmpty)

-					return String.Format ("{0}{1}</{2}>", GetCurrentTagMarkup (), atts, ReadInnerXml (), name);

-				else

-					return String.Format ("{0}", GetCurrentTagMarkup ());

-			case XmlNodeType.None:

-				// MS document is incorrect. Seems not to progress.

-				return String.Empty;

-			default:

-				Read ();

-				return String.Empty;

-			}

-		}

-#endif

-

 		public override string LookupNamespace (string prefix)

 		{

 			XPathNavigator backup = current.Clone ();

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
index 0eacb644e18..4a7aa220a09 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
@@ -21,20 +21,9 @@ using System.Runtime.Serialization;
 
 namespace System.Data.OracleClient {
 	[Serializable]
-	public sealed class OracleException
-#if NET_2_0
-		: System.Data.Common.DbException
-#else
-		: SystemException
-#endif //NET_1_1	
+	public sealed class OracleException : System.Data.Common.DbException
 	{
-		#region Fields
-
-		private int code;
-
-		#endregion // Fields
-
-		#region Constructors
+		int code;
 
 		internal OracleException (int code, string message) : base (message)
 		{
@@ -45,25 +34,13 @@ namespace System.Data.OracleClient {
 		{
 			code = si.GetInt32 ("code");
 		}
-
-		#endregion // Constructors
-
-		#region Properties
-
 		public int Code {
 			get { return code; }
 		}
-
-		#endregion // Properties
-
-		#region Override implementation of Exception
-
 		public override void GetObjectData (SerializationInfo si, StreamingContext context)
 		{
 			si.AddValue ("code", code, typeof(int));
 			base.GetObjectData (si, context);
 		}
-
-		#endregion Override implementation of Exception
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
index bfb97364f16..ccc45404d64 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
@@ -45,10 +45,8 @@ namespace System.Data.Common {
 
 		bool allowBlankPassword;
 		string keyRestrictions;
-#if NET_1_1
 		KeyRestrictionBehavior keyRestrictionBehavior;
 		string connectionString;
-#endif
 
 		#endregion // Fields
 
@@ -77,7 +75,6 @@ namespace System.Data.Common {
 			set { keyRestrictions = value; }
 		}
 
-#if NET_1_1
 		public string ConnectionString {
 			get {
 				if (connectionString == null)
@@ -94,12 +91,10 @@ namespace System.Data.Common {
 				keyRestrictionBehavior = value;
 			}
 		}
-#endif
 
 		#endregion // Properties
 
 		#region // Methods
-#if NET_2_0
 		[EditorBrowsableAttribute (EditorBrowsableState.Never)]
 		public bool ShouldSerializeConnectionString ()
 		{
@@ -113,7 +108,6 @@ namespace System.Data.Common {
 			// FIXME: configurable ? why is this in the attribute class ?
 			return false;
 		}
-#endif
 		#endregion // Methods
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
index da7db7e807f..a198de6bb2c 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
@@ -38,9 +38,7 @@ namespace System.Data.Odbc
 	{
 		#region Constructors
 
-#if NET_1_1
 		[Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
 		public OdbcPermission ()
 			: base (PermissionState.None)
 		{
@@ -51,9 +49,7 @@ namespace System.Data.Odbc
 		{
 		}
 
-#if NET_1_1
 		[Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
 		public OdbcPermission (PermissionState state, bool allowBlankPassword)
 			: base (state)
 		{
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
index 44797ea1784..af23b58cd72 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
@@ -48,9 +48,7 @@ namespace System.Data.OleDb
 
 		#region Constructors
 
-#if NET_1_1
 		[Obsolete ("use OleDbPermission(PermissionState.None)", true)]
-#endif
 		public OleDbPermission ()
 			: base (PermissionState.None)
 		{
@@ -61,9 +59,7 @@ namespace System.Data.OleDb
 		{
 		}
 
-#if NET_1_1
 		[Obsolete ("use OleDbPermission(PermissionState.None)", true)]
-#endif
 		public OleDbPermission (PermissionState state, bool allowBlankPassword)
 			: base (state)
 		{
@@ -86,11 +82,9 @@ namespace System.Data.OleDb
 
 		#region Properties
 
-#if NET_2_0
 		[Obsolete ()]
 		[BrowsableAttribute (false)]
 		[EditorBrowsableAttribute (EditorBrowsableState.Never)]
-#endif
 		public string Provider {
 			get {
 				if (_provider == null)
@@ -108,36 +102,6 @@ namespace System.Data.OleDb
 		{
 			return new OleDbPermission (this);
 		}
-
-#if !NET_2_0
-		// methods required to support Provider were removed in Fx 2.0
-		// i.e. Provider isn't included in the XML output
-
-		public override void FromXml (SecurityElement securityElement)
-		{
-			base.FromXml (securityElement);
-			// Provider
-		}
-
-		[MonoTODO ("is it worth to implement as it is being removed ?")]
-		public override IPermission Intersect (IPermission target)
-		{
-			return base.Intersect (target);
-		}
-
-		public override SecurityElement ToXml ()
-		{
-			SecurityElement se = base.ToXml ();
-			// add Provider
-			return se;
-		}
-
-		[MonoTODO ("is it worth to implement as it is being removed ?")]
-		public override IPermission Union (IPermission target)
-		{
-			return base.Union (target);
-		}
-#endif
 		#endregion
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
index 7b141315d9e..c66bf3328c2 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
@@ -85,12 +85,10 @@ namespace System.Data.SqlClient {
 			return new SqlClientPermission (this);
 		}
 
-#if NET_1_1
 		public override void Add (string connectionString, string restrictions, KeyRestrictionBehavior behavior)
 		{
 			base.Add (connectionString, restrictions, behavior);
 		}
-#endif
 		#endregion // Methods
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
index 0dd0da89ecc..542a564bd1b 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
@@ -45,12 +45,7 @@ using Mono.Data.Tds.Protocol;
 namespace System.Data.SqlClient
 {
 	[Serializable]
-	public sealed class SqlException
-#if NET_2_0
-		: DbException
-#else
-		: SystemException
-#endif //NET_1_1
+	public sealed class SqlException : DbException
 	{
 		#region Fields
 
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
index a6fab12a907..c7c0468ab21 100644
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
@@ -34,9 +34,7 @@ using System.Runtime.Serialization;
 
 namespace System.Data.SqlTypes
 {
-#if NET_1_1
 	[Serializable]
-#endif
 	public sealed class SqlNullValueException : SqlTypeException, ISerializable
 	{
 		public SqlNullValueException ()
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
index 15312cd35d5..ca476adc08a 100644
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
@@ -34,9 +34,7 @@ using System.Runtime.Serialization;
 
 namespace System.Data.SqlTypes
 {
-#if NET_1_1
 	[Serializable]
-#endif
 	public sealed class SqlTruncateException : SqlTypeException, ISerializable
 	{
 		public SqlTruncateException ()
diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs
index 3cef9793b8e..fbbc7e932ba 100644
--- a/mcs/class/System.Data/System.Data/DataRowCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs
@@ -123,11 +123,7 @@ namespace System.Data
 		/// <summary>
 		/// Creates a row using specified values and adds it to the DataRowCollection.
 		/// </summary>
-#if NET_2_0
 		public DataRow Add (params object[] values)
-#else
-		public virtual DataRow Add (object[] values)
-#endif
 		{
 			if (values == null)
 				throw new NullReferenceException ();
@@ -155,24 +151,16 @@ namespace System.Data
 
 					string err = String.Format ("Cannot clear table Parent because " +
 								"ForeignKeyConstraint {0} enforces Child.", uc.ConstraintName);
-#if NET_1_1
 					throw new InvalidConstraintException (err);
-#else
-					throw new ArgumentException (err);
-#endif
 				}
 			}
 
-#if NET_2_0
 			table.DataTableClearing ();
-#endif	
 			List.Clear ();
 
 			// Remove from indexes
 			table.ResetIndexes ();
-#if NET_2_0
 			table.DataTableCleared ();
-#endif
 			OnListChanged (this, new ListChangedEventArgs (ListChangedType.Reset, -1, -1));
 		}
 
@@ -340,7 +328,6 @@ namespace System.Data
 		}
 	}
 
-#if NET_2_0
 	sealed partial class DataRowCollection {
 		public override int Count {
 			get { return List.Count; }
@@ -361,15 +348,4 @@ namespace System.Data
 			return base.GetEnumerator ();
 		}
 	}
-#else
-	[Serializable]
-	partial class DataRowCollection {
-		/// <summary>
-		/// This member overrides InternalDataCollectionBase.List
-		/// </summary>
-		protected override ArrayList List {
-			get { return base.List; }
-		}
-	}
-#endif
 }
diff --git a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
index 652160d14bc..9c2842619f4 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
@@ -97,44 +97,6 @@ namespace MonoTests.System.Data.Common {
 				Assert.AreEqual (count, dbdp.ToXml ().Children.Count, msg + ".Count");
 		}
 
-#if !NET_2_0
-		[Test]
-		public void Constructor_Empty ()
-		{
-			NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission ();
-			Check ("Empty", dbdp, false, false, 0);
-		}
-#elif !NET_1_1
-		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void Constructor_PermissionStateBoolean_Invalid ()
-		{
-			PermissionState ps = (PermissionState) Int32.MinValue;
-			NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-		}
-
-		[Test]
-		public void Constructor_PermissionStateBoolean_None ()
-		{
-			PermissionState ps = PermissionState.None;
-			NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-			Check ("None,False", dbdp, false, false, 0);
-
-			dbdp = new NonAbstractDBDataPermission (ps, true);
-			Check ("None,True", dbdp, true, false, 0);
-		}
-
-		[Test]
-		public void Constructor_PermissionStateBoolean_Unrestricted ()
-		{
-			PermissionState ps = PermissionState.Unrestricted;
-			NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-			Check ("Unrestricted,False", dbdp, false, true, 0);
-
-			dbdp = new NonAbstractDBDataPermission (ps, true);
-			Check ("Unrestricted,True", dbdp, true, true, 0);
-		}
-#endif
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void Constructor_DBDataPermission_Null ()
diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
index 10af5ada60f..26e1301417c 100644
--- a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
@@ -101,17 +101,9 @@ namespace MonoTests.System.Data
 				_constraint2.ConstraintName = "dog"; //case insensitive
 				col.Add (_constraint1);
 				col.Add (_constraint2);
-#if NET_1_1
-#else
-				Assert.Fail ("Failed to throw Duplicate name exception.");
-#endif
 				col.Remove (_constraint2); // only for !1.0
 				col.Remove (_constraint1);
 			}
-#if ! NET_1_1
-			catch (DuplicateNameException) {
-			}
-#endif
 			catch (AssertionException exc) {
 				throw exc;
 			}
@@ -124,16 +116,8 @@ namespace MonoTests.System.Data
 			//Constraint Already exists
 			try {
 				col.Add (_constraint1);
-#if NET_1_1
-#else
-				Assert.Fail ("B2: Failed to throw ArgumentException.");
-#endif
 				col.Remove (_constraint1);
 			} catch (ArgumentException) {
-#if NET_1_1
-#else
-				throw;
-#endif
 			} catch (AssertionException exc) {
 				throw exc;
 			} catch {
diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index f1c7f78b463..2a9db1a1582 100644
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -899,7 +899,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual ("Error#1", (table.GetErrors ())[0].RowError, "#A02");
 		}
 
-#if NET_2_0
 		[Test]
 		public void NewRowAddedTest ()
 		{
@@ -924,7 +923,6 @@ namespace MonoTests.System.Data
 
 			Assert.IsTrue (_tableNewRowAddedEventFired, "#NewRowAdded Event #01");
 		}
-#endif
 
 		[Test]
 		public void CloneCopyTest ()
@@ -983,11 +981,6 @@ namespace MonoTests.System.Data
 			DataColumn[] colArray = {table.Columns[0]};
 			table.PrimaryKey = colArray;
 			table.ExtendedProperties.Add ("TimeStamp", DateTime.Now);
-#if NET_1_1 // This prevents further tests after .NET 1.1.
-#else
-			CultureInfo cultureInfo = new CultureInfo ("en-gb");
-			table.Locale = cultureInfo;
-#endif
 
 			row = table1.NewRow ();
 			row ["Name"] = "Abc";
@@ -1012,10 +1005,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual ("Id / Name + (Id * Id)", cloneTable.DisplayExpression, "#A06");
 			Assert.AreEqual (1, cloneTable.ExtendedProperties.Count, "#A07");
 			Assert.IsFalse (cloneTable.HasErrors, "#A08");
-#if NET_1_1
-#else
-			Assert.AreEqual (2057, cloneTable.Locale.LCID, "#A09");
-#endif
 			Assert.AreEqual (100, cloneTable.MinimumCapacity, "#A10");
 			Assert.AreEqual ("Namespace#1", cloneTable.Namespace, "#A11");
 			Assert.AreEqual ("PrefixNo:1", cloneTable.Prefix, "#A12");
@@ -1033,10 +1022,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual ("Id / Name + (Id * Id)", copyTable.DisplayExpression, "#A21");
 			Assert.AreEqual (1, copyTable.ExtendedProperties.Count, "#A22");
 			Assert.IsTrue (copyTable.HasErrors, "#A23");
-#if NET_1_1
-#else
-			Assert.AreEqual (2057, copyTable.Locale.LCID, "#A24");
-#endif
 			Assert.AreEqual (100, copyTable.MinimumCapacity, "#A25");
 			Assert.AreEqual ("Namespace#1", copyTable.Namespace, "#A26");
 			Assert.AreEqual ("PrefixNo:1", copyTable.Prefix, "#A27");
@@ -1446,11 +1431,7 @@ namespace MonoTests.System.Data
 			// clear test
 			table.Clear ();
 			Assert.AreEqual (0, table.Rows.Count, "#A08");
-#if NET_1_1
 			Assert.AreEqual (0, table.Constraints.Count, "#A09");
-#else
-			Assert.AreEqual (1, table.Constraints.Count, "#A09");
-#endif
 			Assert.AreEqual (0, table.ChildRelations.Count, "#A10");
 		}
 
@@ -1469,18 +1450,14 @@ namespace MonoTests.System.Data
 			table.Rows.Add (new object [] { 4, "mono 4" });
 
 			table.AcceptChanges ();
-#if NET_2_0
 			_tableClearedEventFired = false;
 			table.TableCleared += new DataTableClearEventHandler (OnTableCleared);
 			_tableClearingEventFired = false;
 			table.TableClearing += new DataTableClearEventHandler (OnTableClearing);
-#endif // NET_2_0
 
 			table.Clear ();
-#if NET_2_0
 			Assert.IsTrue (_tableClearingEventFired, "#3 should have fired cleared event");
 			Assert.IsTrue (_tableClearedEventFired, "#0 should have fired cleared event");
-#endif // NET_2_0
 
 			DataRow r = table.Rows.Find (1);
 			Assert.IsTrue (r == null, "#1 should have cleared");
@@ -1490,7 +1467,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual (1, table.Rows.Count, "#2 should add row");
 		}
 
-#if NET_2_0
 		private bool _tableClearedEventFired;
 		private void OnTableCleared (object src, DataTableClearEventArgs args)
 		{
@@ -1508,9 +1484,7 @@ namespace MonoTests.System.Data
 		{
 			_tableNewRowAddedEventFired = true;
 		}
-#endif // NET_2_0
 
-#if NET_2_0
 		[Test]
 		public void TestWriteXmlSchema1 ()
 		{
@@ -1852,7 +1826,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual ("  </xs:element>", substring, "test#32");
 			Assert.AreEqual ("</xs:schema>", TextString, "test#33");
 		}
-#endif
 
 		[Test]
 		public void Serialize ()
@@ -2032,7 +2005,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual (1, dt.Rows.Count);
 		}
 
-#if NET_2_0
 		private bool tableInitialized;
 		[Test]
 		public void TableInitializedEventTest1 ()
@@ -2093,7 +2065,6 @@ namespace MonoTests.System.Data
 		{
 			tableInitialized = true;
 		}
-#endif
 
 		public void OnRowChanging (object src, DataRowChangeEventArgs args)
 		{
@@ -2105,7 +2076,6 @@ namespace MonoTests.System.Data
 			rowActionChanged = args.Action;
 		}
 
-#if NET_2_0
 		private DataTable dt;
 		private void localSetup () {
 			dt = new DataTable ("test");
@@ -4160,7 +4130,6 @@ namespace MonoTests.System.Data
 
 		#endregion // Read/Write XML Tests
 
-#endif // NET_2_0
 	}
 
 	public  class MyDataTable : DataTable
diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
index 5e633630f99..8328f7ebbb2 100644
--- a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
@@ -209,15 +209,11 @@ namespace MonoTests.System.Data
 			// Create a ForeingKeyConstraint Object using the constructor
                         // ForeignKeyConstraint (string, string, string[], string[], AcceptRejectRule, Rule, Rule);
 			 ForeignKeyConstraint fkc = new ForeignKeyConstraint ("hello world", parentTableName, parentColumnNames, childColumnNames, AcceptRejectRule.Cascade, Rule.Cascade, Rule.Cascade);                                                                                                                            // Assert that the Constraint object does not belong to any table yet
-#if NET_1_1
 			try {
 				DataTable tmp = fkc.Table;
 				Fail ("When table is null, get_Table causes an InvalidOperationException.");
 			} catch (InvalidOperationException) {
 			}
-#else
-                        Assertion.AssertEquals ("#A01 Table should not be set", fkc.Table, null);
-#endif
                                                                                                     
                         Constraint []constraints = new Constraint[3];
                         constraints [0] = new UniqueConstraint (column1);
@@ -302,11 +298,7 @@ namespace MonoTests.System.Data
 				fkc = new ForeignKeyConstraint((DataColumn)null,(DataColumn)null);
 				Fail("Failed to throw ArgumentNullException.");
 			}
-#if NET_1_1
 			catch (NullReferenceException) {}
-#else
-			catch (ArgumentNullException) {}
-#endif
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
@@ -344,13 +336,8 @@ namespace MonoTests.System.Data
 				fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[1]);
 				Fail("Failed to throw InvalidConstraintException.");
 			}
-#if NET_1_1
 			// tables in different datasets
 			catch (InvalidOperationException) {}
-#else
-			//different dataTypes
-			catch (InvalidConstraintException) {}
-#endif
 
 			// Cannot create a Key from Columns that belong to
 			// different tables.
diff --git a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
index 5f9b12e7aad..602136ba601 100644
--- a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
@@ -60,17 +60,7 @@ using System.Runtime.InteropServices;
 	[assembly: AssemblyKeyFile("../msfinal.pub")]
 #endif
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Dependency ("System,", LoadHint.Always)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif NET_1_1
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-	[assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-	[assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Dependency ("System,", LoadHint.Always)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AppDomainHelper.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AppDomainHelper.cs
index 66a64e15e2f..0a5bc3d86fc 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AppDomainHelper.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AppDomainHelper.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("ef24f689-14f8-4d92-b4af-d7b1f0e70fd4")]
 	public class AppDomainHelper
 	{
@@ -48,5 +47,4 @@ namespace System.EnterpriseServices.Internal
 
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AssemblyLocator.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AssemblyLocator.cs
index 416c4ecc3f7..6a49a8495a7 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AssemblyLocator.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AssemblyLocator.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("458aa3b5-265a-4b75-bc05-9bea4630cf18")]
 	public class AssemblyLocator : MarshalByRefObject {
 
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClientRemotingConfig.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClientRemotingConfig.cs
index c5f858b5191..1499726678f 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClientRemotingConfig.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClientRemotingConfig.cs
@@ -29,7 +29,6 @@ using System;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	public class ClientRemotingConfig {
 
 		[MonoTODO]
@@ -45,5 +44,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClrObjectFactory.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClrObjectFactory.cs
index 800a29e05e5..48c2bf9437d 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClrObjectFactory.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClrObjectFactory.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("ecabafd1-7f19-11d2-978e-0000f8757e2a")]
 	public class ClrObjectFactory : IClrObjectFactory {
 
@@ -68,5 +67,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComManagedImportUtil.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComManagedImportUtil.cs
index 4b2f07141cb..45befdd77f5 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComManagedImportUtil.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComManagedImportUtil.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("3b0398c9-7812-4007-85cb-18c771f2206f")]
 	public class ComManagedImportUtil : IComManagedImportUtil {
 
@@ -53,5 +52,4 @@ namespace System.EnterpriseServices.Internal
 			throw new NotImplementedException ();
 		}
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComSoapPublishError.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComSoapPublishError.cs
index af093859b41..1b54e64fb1e 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComSoapPublishError.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComSoapPublishError.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	public class ComSoapPublishError {
 
 		[MonoTODO]
@@ -46,5 +45,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/GenerateMetadata.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/GenerateMetadata.cs
index 495de64f637..1928b8b8e6c 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/GenerateMetadata.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/GenerateMetadata.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("d8013ff1-730b-45e2-ba24-874b7242c425")]
 	public class GenerateMetadata : IComSoapMetadata {
 
@@ -66,5 +65,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IClrObjectFactory.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IClrObjectFactory.cs
index e6f925232f5..6035ea4adfb 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IClrObjectFactory.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IClrObjectFactory.cs
@@ -31,30 +31,20 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("ecabafd2-7f19-11d2-978e-0000f8757e2a")]
 	public interface IClrObjectFactory
 	{
 		[DispId(1)]
-#if NET_2_0
 		[return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
 		object CreateFromAssembly (string assembly, string type, string mode);
 		[DispId(4)]
-#if NET_2_0
 		[return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
 		object CreateFromMailbox (string Mailbox, string Mode);
 		[DispId(2)]
-#if NET_2_0
 		[return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
 		object CreateFromVroot (string VrootUrl, string Mode);
 		[DispId(3)]
-#if NET_2_0
 		[return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
 		object CreateFromWsdl (string WsdlUrl, string Mode);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComManagedImportUtil.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComManagedImportUtil.cs
index 87ad358865e..4385073a107 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComManagedImportUtil.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComManagedImportUtil.cs
@@ -32,7 +32,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("c3f8f66b-91be-4c99-a94f-ce3b0a951039")]
 	public interface IComManagedImportUtil 
 	{
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal
 		[DispId(5)] 
 		void InstallAssembly ([MarshalAs(UnmanagedType.BStr)] string filename, [MarshalAs(UnmanagedType.BStr)] string parname, [MarshalAs(UnmanagedType.BStr)] string appname);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapIISVRoot.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapIISVRoot.cs
index 11b2aa5b674..f44a526f68c 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapIISVRoot.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapIISVRoot.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("d8013ef0-730b-45e2-ba24-874b7242c425")]
 	public interface IComSoapIISVRoot {
 		[DispId(1)]
@@ -39,5 +38,4 @@ namespace System.EnterpriseServices.Internal {
 		[DispId(2)]
 		void Delete ([MarshalAs(UnmanagedType.BStr)] string RootWeb, [MarshalAs(UnmanagedType.BStr)] string PhysicalDirectory, [MarshalAs(UnmanagedType.BStr)] string VirtualDirectory, [MarshalAs(UnmanagedType.BStr)] out string Error);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapMetadata.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapMetadata.cs
index 068fbc7fb51..4f80008d8ad 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapMetadata.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapMetadata.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("d8013ff0-730b-45e2-ba24-874b7242c425")]
 	public interface IComSoapMetadata {
 		[return: MarshalAs(UnmanagedType.BStr)]
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal {
 		[DispId(2)]
 		string GenerateSigned ([MarshalAs(UnmanagedType.BStr)] string SrcTypeLibFileName, [MarshalAs(UnmanagedType.BStr)] string OutPath, [MarshalAs(UnmanagedType.Bool)] bool InstallGac, [MarshalAs(UnmanagedType.BStr)] out string Error);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapPublisher.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapPublisher.cs
index c3c30f06337..4527906deae 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapPublisher.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapPublisher.cs
@@ -32,7 +32,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("d8013eee-730b-45e2-ba24-874b7242c425")]
 	public interface IComSoapPublisher
 	{
@@ -112,5 +111,4 @@ namespace System.EnterpriseServices.Internal
 		[DispId(12)]
 		void UnRegisterAssembly ([MarshalAs(UnmanagedType.BStr)] string AssemblyPath);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IISVirtualRoot.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IISVirtualRoot.cs
index 61da318bba6..311d6944b92 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IISVirtualRoot.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IISVirtualRoot.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("d8013ef1-730b-45e2-ba24-874b7242c425")]
 	public class IISVirtualRoot : IComSoapIISVRoot {
 
@@ -53,5 +52,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IServerWebConfig.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IServerWebConfig.cs
index c88ab0e7076..fbd75e1e703 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IServerWebConfig.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IServerWebConfig.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("6261e4b5-572a-4142-a2f9-1fe1a0c97097")]
 	public interface IServerWebConfig {
 		[DispId(1)]
@@ -49,5 +48,4 @@ namespace System.EnterpriseServices.Internal {
 			[MarshalAs(UnmanagedType.BStr)] string FileRootName,
 			[MarshalAs(UnmanagedType.BStr)] out string Error);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapClientImport.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapClientImport.cs
index 62c55831a8f..ca7f96f2d6c 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapClientImport.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapClientImport.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("E7F0F021-9201-47e4-94DA-1D1416DEC27A")]
 	public interface ISoapClientImport {
 		[DispId(1)]
@@ -43,5 +42,4 @@ namespace System.EnterpriseServices.Internal {
 			[MarshalAs(UnmanagedType.BStr)] string assemblyName,
 			[MarshalAs(UnmanagedType.BStr)] string typeName);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerTlb.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerTlb.cs
index 0b457af5336..adcc8b4a75a 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerTlb.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerTlb.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("1E7BA9F7-21DB-4482-929E-21BDE2DFE51C")]
 	public interface ISoapServerTlb {
 		[DispId(1)]
@@ -63,5 +62,4 @@ namespace System.EnterpriseServices.Internal {
 			[MarshalAs(UnmanagedType.BStr)] string assemblyName,
 			[MarshalAs(UnmanagedType.BStr)] string typeName);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerVRoot.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerVRoot.cs
index 1e3ed0cb6bf..300f6f595cb 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerVRoot.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerVRoot.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("A31B6577-71D2-4344-AEDF-ADC1B0DC5347")]
 	public interface ISoapServerVRoot {
 		[DispId(1)]
@@ -69,5 +68,4 @@ namespace System.EnterpriseServices.Internal {
 			[MarshalAs(UnmanagedType.BStr)] out string baseUrl,
 			[MarshalAs(UnmanagedType.BStr)] out string virtualRoot);
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapUtility.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapUtility.cs
index 7c10f881c3f..64f1e76e7c8 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapUtility.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapUtility.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
 	[Guid("5AC4CB7E-F89F-429b-926B-C7F940936BF4")]
 	public interface ISoapUtility {
 		[DispId(2)]
@@ -51,5 +50,4 @@ namespace System.EnterpriseServices.Internal {
 		[DispId(3)]
 		void Present ();
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/Publish.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/Publish.cs
index d6920fa6701..73d41c10aed 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/Publish.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/Publish.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("d8013eef-730b-45e2-ba24-874b7242c425")]
 	public class Publish : IComSoapPublisher {
 
@@ -125,5 +124,4 @@ namespace System.EnterpriseServices.Internal
 			throw new NotImplementedException ();
 		}
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ServerWebConfig.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ServerWebConfig.cs
index 9745e3094d7..7292bc2d2b7 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ServerWebConfig.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ServerWebConfig.cs
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	public class ServerWebConfig : IServerWebConfig {
 
 		[MonoTODO]
@@ -52,5 +51,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapClientImport.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapClientImport.cs
index 456dcf07ccc..5aa1050520b 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapClientImport.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapClientImport.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("346D5B9F-45E1-45c0-AADF-1B7D221E9063")]
 	public sealed class SoapClientImport : ISoapClientImport {
 
@@ -49,5 +48,4 @@ namespace System.EnterpriseServices.Internal
 
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerTlb.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerTlb.cs
index c3677ce7ee3..75bf6db77ef 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerTlb.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerTlb.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("F6B6768F-F99E-4152-8ED2-0412F78517FB")]
 	public sealed class SoapServerTlb : ISoapServerTlb {
 
@@ -54,5 +53,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerVRoot.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerVRoot.cs
index 5018df3acea..a8c215f0d01 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerVRoot.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerVRoot.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("CAA817CC-0C04-4d22-A05C-2B7E162F4E8F")]
 	public sealed class SoapServerVRoot : ISoapServerVRoot {
 
@@ -61,5 +60,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapUtility.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapUtility.cs
index ba6eea9802a..e3923889fa5 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapUtility.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapUtility.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
 	[Guid("5F9A955F-AA55-4127-A32B-33496AA8A44E")]
 	public sealed class SoapUtility : ISoapUtility {
 
@@ -60,5 +59,4 @@ namespace System.EnterpriseServices.Internal
 		}
 
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/Activity.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/Activity.cs
index e51b3fba474..66d4c6f2d24 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/Activity.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/Activity.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[ComVisible(false)]

 	public sealed class Activity {

 

@@ -73,5 +72,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BindingOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BindingOption.cs
index 93dc6818611..709da2323df 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BindingOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BindingOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum BindingOption {

@@ -39,5 +38,4 @@ namespace System.EnterpriseServices {
 		NoBinding,

 		BindingToPoolThread

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IAsyncErrorNotify.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IAsyncErrorNotify.cs
index 11bd5e2cbdd..46d8797f961 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IAsyncErrorNotify.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IAsyncErrorNotify.cs
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Guid("FE6777FB-A674-4177-8F32-6D707E113484")]

 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

-#if NET_2_0

 	[ComImport]

-#endif

 	public interface IAsyncErrorNotify {

 

 		#region Methods

@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IPlaybackControl.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IPlaybackControl.cs
index 37ffcebfa87..dc536bcd7bf 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IPlaybackControl.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IPlaybackControl.cs
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Guid("51372AFD-CAE7-11CF-BE81-00AA00A2FA25")]

 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

-#if NET_2_0

 	[ComImport]

-#endif

 	public interface IPlaybackControl {

 

 		#region Methods

@@ -47,5 +44,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitControl.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitControl.cs
index 221aaf14135..d0bdc5df1b6 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitControl.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitControl.cs
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Guid("72380d55-8d2b-43a3-8513-2b6ef31434e9")]

 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

-#if NET_2_0

 	[ComImport]

-#endif

 	public interface IProcessInitControl {

 

 		#region Methods

@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitializer.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitializer.cs
index fe32de0feff..3491b64336f 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitializer.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitializer.cs
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices {
 
-#if NET_1_1
 	[Guid("1113f52d-dc7f-4943-aed6-88d04027e32a")]
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-#if NET_2_0
 	[ComImport]
-#endif
 	public interface IProcessInitializer {
 
 		#region Methods
@@ -47,5 +44,4 @@ namespace System.EnterpriseServices {
 
 		#endregion
 	}
-#endif
 }
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServiceCall.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServiceCall.cs
index b3895406f50..447588a1c92 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServiceCall.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServiceCall.cs
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Guid("BD3E2E12-42DD-40f4-A09A-95A50C58304B")]

 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

-#if NET_2_0

 	[ComImport]

-#endif

 	public interface IServiceCall {

 

 		#region Methods

@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
index 478554c8235..7cadf861662 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum InheritanceOption {

@@ -39,5 +38,4 @@ namespace System.EnterpriseServices {
 		Inherit,

 		Ignore

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PartitionOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PartitionOption.cs
index f3ac104e39f..8ea16469cf2 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PartitionOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PartitionOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum PartitionOption {

@@ -40,5 +39,4 @@ namespace System.EnterpriseServices {
 		Inherit,

 		New

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationConfig.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationConfig.cs
index e35406207e4..8a1d1c1bf00 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationConfig.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationConfig.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[Guid("36dcda30-dc3b-4d93-be42-90b2d74c64e7")]

 	public class RegistrationConfig {

@@ -110,5 +109,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
index 0750fe0ce36..860ffa48834 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
@@ -59,13 +59,11 @@ namespace System.EnterpriseServices {
 			throw new NotImplementedException ();
 		}
 
-#if NET_1_1
 		[MonoTODO]
 		public void InstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		public void UninstallAssembly (string assembly, string application)
 		{
@@ -78,13 +76,11 @@ namespace System.EnterpriseServices {
 			throw new NotImplementedException ();
 		}
 
-#if NET_1_1
 		[MonoTODO]
 		public void UninstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		#endregion // Methods
 	}
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
index a1fe576b1a6..70fd1cdb808 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
@@ -70,13 +70,11 @@ namespace System.EnterpriseServices {
 			throw new NotImplementedException ();
 		}
 
-#if NET_1_1
 		[MonoTODO]
 		public void InstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig, object sync)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoTODO]
 		public bool IsInTransaction ()
@@ -95,13 +93,11 @@ namespace System.EnterpriseServices {
 			throw new NotImplementedException ();
 		}
 
-#if NET_1_1
 		[MonoTODO]
 		public void UninstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig, object sync)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		#endregion // Methods
 	}
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServiceConfig.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServiceConfig.cs
index 02a440252b3..1dc83a10a32 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServiceConfig.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServiceConfig.cs
@@ -34,7 +34,6 @@ using System.Transactions;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[MonoTODO]

 	[ComVisible(false)]

 	public sealed class ServiceConfig {

@@ -265,5 +264,4 @@ namespace System.EnterpriseServices {
 

 		#endregion

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SxsOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SxsOption.cs
index 7330cb65a50..6cd57c7a9e9 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SxsOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SxsOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum SxsOption {

@@ -40,5 +39,4 @@ namespace System.EnterpriseServices {
 		Inherit,

 		New

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ThreadPoolOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ThreadPoolOption.cs
index 065150db648..f7d430b3600 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ThreadPoolOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ThreadPoolOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum ThreadPoolOption {

@@ -41,5 +40,4 @@ namespace System.EnterpriseServices {
 		STA,

 		MTA

 	}

-#endif

 }

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionStatus.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionStatus.cs
index 2f403ec55f3..ea80895d96f 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionStatus.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionStatus.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 

 namespace System.EnterpriseServices {

 

-#if NET_1_1

 	[Serializable]

 	[ComVisible(false)]

 	public enum TransactionStatus {

@@ -42,5 +41,4 @@ namespace System.EnterpriseServices {
 		Aborting,

 		Aborted

 	}

-#endif

 }

diff --git a/mcs/class/System.Management/Assembly/AssemblyInfo.cs b/mcs/class/System.Management/Assembly/AssemblyInfo.cs
index ee74384c1fe..7b3a6b0a9d4 100644
--- a/mcs/class/System.Management/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Management/Assembly/AssemblyInfo.cs
@@ -60,15 +60,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-	[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1 || NET_1_0
-	[assembly: AssemblyTitle ("System.Management")]
-	[assembly: AssemblyDescription ("This assembly contains the classes necessary to access management information from managed code")]
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-	[assembly: AssemblyKeyName ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
diff --git a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
index 89e69f75f76..7acff868a0f 100644
--- a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
@@ -57,15 +57,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-	[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
index 04c6aa84930..b61844f8f33 100644
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -61,16 +61,10 @@ using System.Runtime.InteropServices;
 	[assembly: AssemblyKeyFile("../ecma.pub")]
 #endif
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CLSCompliant (false)]
-	[assembly: ComVisible (false)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-	[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-	[assembly: TypeLibVersion (2, 0)]
-#elif NET_1_1
-	[assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-	[assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CLSCompliant (false)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+[assembly: TypeLibVersion (2, 0)]
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
index 64482b84f2e..cb232dc6e32 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
@@ -38,11 +38,7 @@ namespace System.Runtime.Remoting.Channels
 		IClientChannelSinkProvider next = null;
 		BinaryCore _binaryCore;
 
-#if NET_1_1
 		static string[] allowedProperties = new string [] { "includeVersions", "strictBinding", "typeFilterLevel" };
-#else
-		static string[] allowedProperties = new string [] { "includeVersions", "strictBinding" };
-#endif
 
 		public BinaryClientFormatterSinkProvider ()
 		{
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
index 8cc9a39b14f..7da3a54c3ce 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
@@ -43,9 +43,7 @@ namespace System.Runtime.Remoting.Channels
 		bool _strictBinding = false;
 		IDictionary _properties;
 		
-#if NET_1_1
 		TypeFilterLevel _filterLevel = TypeFilterLevel.Low;
-#endif
 		
 		public static BinaryCore DefaultInstance = new BinaryCore ();
 		
@@ -74,7 +72,6 @@ namespace System.Runtime.Remoting.Channels
 						_strictBinding = Convert.ToBoolean (property.Value);
 						break;
 						
-#if NET_1_1
 					case "typeFilterLevel":
 						if (property.Value is TypeFilterLevel)
 							_filterLevel = (TypeFilterLevel) property.Value;
@@ -83,7 +80,6 @@ namespace System.Runtime.Remoting.Channels
 							_filterLevel = (TypeFilterLevel) Enum.Parse (typeof(TypeFilterLevel), s);
 						}
 						break;
-#endif
 						
 				}
 			}
@@ -110,10 +106,8 @@ namespace System.Runtime.Remoting.Channels
 			_deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
 #endif
 			
-#if NET_1_1
 			_serializationFormatter.FilterLevel = _filterLevel;
 			_deserializationFormatter.FilterLevel = _filterLevel;
-#endif
 			
 			if (!_includeVersions)
 			{
@@ -143,12 +137,10 @@ namespace System.Runtime.Remoting.Channels
 			get { return _properties; }
 		}
 		
-#if NET_1_1
 		public TypeFilterLevel TypeFilterLevel
 		{
 			get { return _filterLevel; }
 		}
-#endif
 	}
 }
 
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
index 09c2b7f8eac..f9031a7dd8f 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
@@ -80,7 +80,6 @@ namespace System.Runtime.Remoting.Channels {
 			}
 		}
 
-#if NET_1_1
 		[ComVisible(false)]
 		public TypeFilterLevel TypeFilterLevel
 		{
@@ -92,7 +91,6 @@ namespace System.Runtime.Remoting.Channels {
 				_binaryCore = new BinaryCore (this, props, BinaryServerFormatterSinkProvider.AllowedProperties);
 			}
 		}
-#endif
 
 		public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
 						  IMessage msg, ITransportHeaders headers, Stream stream)
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
index 3f77fd3aa27..b4c3b0537f7 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
@@ -68,7 +68,6 @@ namespace System.Runtime.Remoting.Channels
 			}
 		}
 
-#if NET_1_1
 		[ComVisible(false)]
 		public TypeFilterLevel TypeFilterLevel
 		{
@@ -80,7 +79,6 @@ namespace System.Runtime.Remoting.Channels
 				_binaryCore = new BinaryCore (this, props, AllowedProperties);
 			}
 		}
-#endif
 
 		public IServerChannelSink CreateSink (IChannelReceiver channel)
 		{
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapCore.cs
index 7fcbf261dfe..3480f3dfa40 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapCore.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapCore.cs
@@ -43,9 +43,7 @@ namespace System.Runtime.Remoting.Channels
 		bool _strictBinding = false;
 		IDictionary _properties;
 		
-#if NET_1_1
 		TypeFilterLevel _filterLevel = TypeFilterLevel.Low;
-#endif
 
 		public static SoapCore DefaultInstance = new SoapCore ();
 		
@@ -73,7 +71,6 @@ namespace System.Runtime.Remoting.Channels
 					case "strictBinding":
 						_strictBinding = Convert.ToBoolean (property.Value);
 						break;
-#if NET_1_1
 					case "typeFilterLevel":
 						if (property.Value is TypeFilterLevel)
 							_filterLevel = (TypeFilterLevel) property.Value;
@@ -82,7 +79,6 @@ namespace System.Runtime.Remoting.Channels
 							_filterLevel = (TypeFilterLevel) Enum.Parse (typeof(TypeFilterLevel), s);
 						}
 						break;
-#endif
 				}
 			}
 			
@@ -103,10 +99,8 @@ namespace System.Runtime.Remoting.Channels
 			_serializationFormatter = CreateFormatter (surrogateSelector, context);
 			_deserializationFormatter = CreateFormatter (null, context);
 
-#if NET_1_1
 			_serializationFormatter.FilterLevel = _filterLevel;
 			_deserializationFormatter.FilterLevel = _filterLevel;
-#endif
 		}
 		
 		SoapFormatter CreateFormatter (ISurrogateSelector selector, StreamingContext context)
@@ -143,12 +137,10 @@ namespace System.Runtime.Remoting.Channels
 			get { return _properties; }
 		}
 		
-#if NET_1_1
 		public TypeFilterLevel TypeFilterLevel
 		{
 			get { return _filterLevel; }
 		}
-#endif
 	}
 }
 
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
index 841bcea566d..d818bca48c7 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
@@ -86,7 +86,6 @@ namespace System.Runtime.Remoting.Channels {
 			}

 		}

 

-#if NET_1_1

 		[ComVisible(false)]

 		public TypeFilterLevel TypeFilterLevel

 		{

@@ -98,7 +97,6 @@ namespace System.Runtime.Remoting.Channels {
 				_soapCore = new SoapCore (this, props, SoapServerFormatterSinkProvider.AllowedProperties);

 			}

 		}

-#endif

 

 		public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,

 						  IMessage msg, ITransportHeaders headers, Stream stream)

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
index b0b164d98c0..a0f9ef4a389 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
@@ -64,7 +64,6 @@ namespace System.Runtime.Remoting.Channels
 			set { _next = value; }

 		}

 

-#if NET_1_1

 		[ComVisible(false)]

 		public TypeFilterLevel TypeFilterLevel

 		{

@@ -76,7 +75,6 @@ namespace System.Runtime.Remoting.Channels
 				_soapCore = new SoapCore (this, props, AllowedProperties);

 			}

 		}

-#endif

 

 		public IServerChannelSink CreateSink (IChannelReceiver channel)

 		{

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
index d6f66de4daf..8fd2335c792 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
@@ -52,9 +52,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
 		private FormatterTypeStyle _typeFormat = FormatterTypeStyle.TypesWhenNeeded;

 		private ISoapMessage _topObject = null;

 		

-#if NET_1_1

 		TypeFilterLevel _filterLevel = TypeFilterLevel.Low;

-#endif

 

 		public SoapFormatter() {

 			_selector = null;

@@ -146,11 +144,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
 			}

 		}

 		

-#if NET_1_1

 		[MonoTODO ("Interpret this")]

-#if ONLY_1_1

-		[ComVisible(false)]

-#endif

 		public TypeFilterLevel FilterLevel {

 			get {

 				return _filterLevel;

@@ -159,7 +153,6 @@ namespace System.Runtime.Serialization.Formatters.Soap {
 				_filterLevel = value;

 			}

 		}

-#endif

 		

 		public FormatterAssemblyStyle AssemblyFormat

 		{

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
index c0aaaa2e76f..8293e1d4f99 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
@@ -38,10 +38,7 @@ using System.Security.Policy;
 using System.Net;
 using System.Text;
 using System.Xml;
-
-#if NET_2_0
 using System.Security.Cryptography.X509Certificates;
-#endif
 
 namespace System.Security.Cryptography.Xml {
 
@@ -56,7 +53,6 @@ namespace System.Security.Cryptography.Xml {
 		public const string XmlDsigRSASHA1Url				= XmlDsigNamespaceUrl + "rsa-sha1";
 		public const string XmlDsigSHA1Url				= XmlDsigNamespaceUrl + "sha1";
 
-#if NET_2_0
 		public const string XmlDecryptionTransformUrl			= "http://www.w3.org/2002/07/decrypt#XML";
 		public const string XmlDsigBase64TransformUrl			= XmlDsigNamespaceUrl + "base64";
 		public const string XmlDsigC14NTransformUrl			= XmlDsigCanonicalizationUrl;
@@ -69,7 +65,6 @@ namespace System.Security.Cryptography.Xml {
 		public const string XmlLicenseTransformUrl			= "urn:mpeg:mpeg21:2003:01-REL-R-NS:licenseTransform";
 
 		private EncryptedXml encryptedXml;
-#endif
 
 		protected Signature m_signature;
 		private AsymmetricAlgorithm key;
@@ -79,15 +74,9 @@ namespace System.Security.Cryptography.Xml {
 		private XmlElement signatureElement;
 		private Hashtable hashes;
 		// FIXME: enable it after CAS implementation
-#if false //NET_1_1
-		private XmlResolver xmlResolver = new XmlSecureResolver (new XmlUrlResolver (), new Evidence ());
-#else
 		private XmlResolver xmlResolver = new XmlUrlResolver ();
-#endif
 		private ArrayList manifests;
-#if NET_2_0
 		private IEnumerator _x509Enumerator;
-#endif
 
 		private static readonly char [] whitespaceChars = new char [] {' ', '\r', '\n', '\t'};
 
@@ -113,20 +102,16 @@ namespace System.Security.Cryptography.Xml {
 			envdoc.LoadXml (elem.OuterXml);
 		}
 
-#if NET_2_0
 		[ComVisible (false)]
 		public EncryptedXml EncryptedXml {
 			get { return encryptedXml; }
 			set { encryptedXml = value; }
 		}
-#endif
 
 		public KeyInfo KeyInfo {
 			get {
-#if NET_2_0
 				if (m_signature.KeyInfo == null)
 					m_signature.KeyInfo = new KeyInfo ();
-#endif
 				return m_signature.KeyInfo;
 			}
 			set { m_signature.KeyInfo = value; }
@@ -170,10 +155,8 @@ namespace System.Security.Cryptography.Xml {
 
 		public void AddReference (Reference reference) 
 		{
-#if NET_2_0
 			if (reference == null)
 				throw new ArgumentNullException ("reference");
-#endif
 			m_signature.SignedInfo.AddReference (reference);
 		}
 
@@ -183,9 +166,7 @@ namespace System.Security.Cryptography.Xml {
 			// not affect to the input itself.
 			if (t is XmlDsigXPathTransform 
 				|| t is XmlDsigEnvelopedSignatureTransform
-#if NET_2_0
 				|| t is XmlDecryptionTransform
-#endif
 			)
 				input = (XmlDocument) input.Clone ();
 
@@ -503,13 +484,8 @@ namespace System.Security.Cryptography.Xml {
 				if (!CheckSignatureWithKey (key))
 					return null;
 			} else {
-#if NET_2_0
 				if (Signature.KeyInfo == null)
 					return null;
-#else
-				if (Signature.KeyInfo == null)
-					throw new CryptographicException ("At least one KeyInfo is required.");
-#endif
 				// no supplied key, iterates all KeyInfo
 				while ((key = GetPublicKey ()) != null) {
 					if (CheckSignatureWithKey (key)) {
@@ -633,14 +609,12 @@ namespace System.Security.Cryptography.Xml {
 			return false;
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		[ComVisible (false)]
 		public bool CheckSignature (X509Certificate2 certificate, bool verifySignatureOnly)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		public bool CheckSignatureReturningKey (out AsymmetricAlgorithm signingKey) 
 		{
@@ -689,7 +663,6 @@ namespace System.Security.Cryptography.Xml {
 
 			if (macAlg is HMACSHA1) {
 				method = XmlDsigHMACSHA1Url;
-#if NET_2_0
 			} else if (macAlg is HMACSHA256) {
 				method = "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256";
 			} else if (macAlg is HMACSHA384) {
@@ -698,7 +671,6 @@ namespace System.Security.Cryptography.Xml {
 				method = "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512";
 			} else if (macAlg is HMACRIPEMD160) {
 				method = "http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160";
-#endif
 			}
 
 			if (method == null)
@@ -734,7 +706,7 @@ namespace System.Security.Cryptography.Xml {
 				pkEnumerator = m_signature.KeyInfo.GetEnumerator ();
 			}
 			
-#if NET_2_0 && SECURITY_DEP
+#if SECURITY_DEP
 			if (_x509Enumerator != null) {
 				if (_x509Enumerator.MoveNext ()) {
 					X509Certificate cert = (X509Certificate) _x509Enumerator.Current;
@@ -758,7 +730,7 @@ namespace System.Security.Cryptography.Xml {
 					return key;
 				}
 
-#if NET_2_0 && SECURITY_DEP
+#if SECURITY_DEP
 				if (kic is KeyInfoX509Data) {
 					_x509Enumerator = ((KeyInfoX509Data) kic).Certificates.GetEnumerator ();
 					if (_x509Enumerator.MoveNext ()) {
@@ -783,7 +755,6 @@ namespace System.Security.Cryptography.Xml {
 
 			signatureElement = value;
 			m_signature.LoadXml (value);
-#if NET_2_0
 			// Need to give the EncryptedXml object to the 
 			// XmlDecryptionTransform to give it a fighting 
 			// chance at decrypting the document.
@@ -793,14 +764,11 @@ namespace System.Security.Cryptography.Xml {
 						((XmlDecryptionTransform) t).EncryptedXml = EncryptedXml;
 				}
 			}
-#endif
 		}
 
-#if NET_1_1
 		[ComVisible (false)]
 		public XmlResolver Resolver {
 			set { xmlResolver = value; }
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
index bfa9b6b7630..80c8923e99d 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
@@ -45,11 +45,7 @@ namespace System.Security.Cryptography.Xml {
 		private XmlResolver xmlResolver;
 		private Hashtable propagated_namespaces = new Hashtable ();
 
-#if NET_2_0
 		protected Transform ()
-#else
-		public Transform ()
-#endif
 		{
 			if (SecurityManager.SecurityEnabled) {
 				xmlResolver = new XmlSecureResolver (new XmlUrlResolver (), (Evidence) new Evidence ());
@@ -73,43 +69,32 @@ namespace System.Security.Cryptography.Xml {
 			get;
 		}
 
-#if NET_1_1
 		[ComVisible(false)]
 		public XmlResolver Resolver {
 			set { xmlResolver = value; }
 		}
-#endif
 
-#if NET_2_0
 		[MonoTODO]
 		[ComVisible (false)]
 		public XmlElement Context {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
-#endif
 
 		[ComVisible (false)]
-#if NET_2_0
-		public
-#else
-		internal
-#endif
-		Hashtable PropagatedNamespaces {
+		public Hashtable PropagatedNamespaces {
 			get { return propagated_namespaces; }
 		}
 
 		#endregion // Properties
 
 		#region Methods
-#if NET_2_0
 		[ComVisible (false)]
 		public virtual byte[] GetDigestedOutput (HashAlgorithm hash)
 		{
 			// no null check, MS throws a NullReferenceException here
 			return hash.ComputeHash ((Stream) GetOutput (typeof (Stream)));
 		}
-#endif
 
 		protected abstract XmlNodeList GetInnerXml ();
 
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
index 935980a7557..1a78700c57b 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
@@ -121,9 +121,7 @@ namespace System.Security.Cryptography.Xml {
 			if (stream != null) {
 				XmlDocument doc = new XmlDocument ();
 				doc.PreserveWhitespace = true;	// REALLY IMPORTANT
-#if NET_1_1
 				doc.XmlResolver = GetResolver ();
-#endif
 				doc.Load (new XmlSignatureStreamReader (new StreamReader (stream)));
 //				doc.Load ((Stream) obj);
 				s = canonicalizer.Canonicalize (doc);
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigEnvelopedSignatureTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigEnvelopedSignatureTransform.cs
index 137d5c269b7..80f3c0db0c3 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigEnvelopedSignatureTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigEnvelopedSignatureTransform.cs
@@ -95,9 +95,7 @@ namespace System.Security.Cryptography.Xml {
 			if (inputObj is Stream) {
 				doc = new XmlDocument ();
 				doc.PreserveWhitespace = true;
-#if NET_1_1
 				doc.XmlResolver = GetResolver ();
-#endif
 				doc.Load (new XmlSignatureStreamReader (
 					new StreamReader (inputObj as Stream)));
 				return GetOutputFromNode (doc, GetNamespaceManager (doc), true);
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.cs
index c8c777df804..b8a432c58d6 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.cs
@@ -140,9 +140,7 @@ namespace System.Security.Cryptography.Xml {
 			if (stream != null) {
 				XmlDocument doc = new XmlDocument ();
 				doc.PreserveWhitespace = true;	// REALLY IMPORTANT
-#if NET_1_1
 				doc.XmlResolver = GetResolver ();
-#endif
 				doc.Load (new XmlSignatureStreamReader (new StreamReader (stream)));
 //				doc.Load ((Stream) obj);
 				s = canonicalizer.Canonicalize (doc);
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
index 185e8b3dcd4..654385ae142 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
@@ -190,9 +190,7 @@ namespace System.Security.Cryptography.Xml
 			if (obj is Stream) {
 				doc = new XmlDocument ();
 				doc.PreserveWhitespace = true;
-#if NET_1_1
 				doc.XmlResolver = GetResolver ();
-#endif
 				doc.Load (new XmlSignatureStreamReader (
 					new StreamReader ((Stream) obj)));
 			}
@@ -201,9 +199,7 @@ namespace System.Security.Cryptography.Xml
 			}
 			else if (obj is XmlNodeList) {
 				doc = new XmlDocument ();
-#if NET_1_1
 				doc.XmlResolver = GetResolver ();
-#endif
 				foreach (XmlNode xn in (obj as XmlNodeList))  {
 					XmlNode importedNode = doc.ImportNode (xn, true);
 					doc.AppendChild (importedNode);
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXsltTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXsltTransform.cs
index 2bf7e416dde..d039bf16730 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXsltTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXsltTransform.cs
@@ -87,37 +87,24 @@ namespace System.Security.Cryptography.Xml
 
 		public override object GetOutput () 
 		{
-#if NET_2_0
 			if (xnl == null)
 				throw new ArgumentNullException ("LoadInnerXml before transformation.");
-#endif
+
 			XmlResolver resolver = GetResolver ();
 
 			XslTransform xsl = new XslTransform ();
 			XmlDocument doc = new XmlDocument ();
-#if NET_1_1
 			doc.XmlResolver = resolver;
-#endif
 			foreach (XmlNode n in xnl)
 				doc.AppendChild (doc.ImportNode (n, true));
-#if NET_1_1
 			xsl.Load (doc, resolver);
-#else
-			xsl.Load (doc);
-#endif
 
 			if (inputDoc == null)
-#if NET_2_0
 				throw new ArgumentNullException ("LoadInput before transformation.");
-#else
-				throw new NullReferenceException ("LoadInput before transformation.");
-#endif
 
 			MemoryStream stream = new MemoryStream ();
 			// only possible output: Stream
-#if NET_1_1
 			xsl.XmlResolver = resolver;
-#endif
 			xsl.Transform (inputDoc, null, stream);
 
 			stream.Seek (0, SeekOrigin.Begin);
@@ -144,9 +131,7 @@ namespace System.Security.Cryptography.Xml
 			Stream s = (obj as Stream);
 			if (s != null) {
 				inputDoc = new XmlDocument ();
-#if NET_1_1
 				inputDoc.XmlResolver = GetResolver ();
-#endif
 //				inputDoc.Load (obj as Stream);
 				inputDoc.Load (new XmlSignatureStreamReader (new StreamReader (s)));
 				return;
@@ -161,9 +146,7 @@ namespace System.Security.Cryptography.Xml
 			XmlNodeList nl = (obj as XmlNodeList);
 			if (nl != null) {
 				inputDoc = new XmlDocument ();
-#if NET_1_1
 				inputDoc.XmlResolver = GetResolver ();
-#endif
 				for (int i = 0; i < nl.Count; i++)
 					inputDoc.AppendChild (inputDoc.ImportNode (nl [i], true));
 			}
diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs
index 589cdbc5204..140bdc7b589 100644
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs
@@ -86,15 +86,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 			KeyInfoRetrievalMethod uri1 = new KeyInfoRetrievalMethod ();
 			// no exception is thrown
 			uri1.LoadXml (doc.DocumentElement);
-#if NET_2_0
 			AssertCrypto.AssertXmlEquals ("invalid", "<RetrievalMethod xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml));
-#elif NET_1_1
-			// note that URI="" is present (unlike a empty Uri)
-			Assert.AreEqual ("<RetrievalMethod URI=\"\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "invalid");
-#else
-			// Fx 1.0 misnamed the tag name
-			Assert.AreEqual ("<RetrievalElement URI=\"\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "invalid");
-#endif
 		}
 	}
 }
diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs
index 8ddba56c7e1..816df3e9809 100644
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs
@@ -153,19 +153,12 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 			transform.LoadInput (doc);
 			Stream s = (Stream) transform.GetOutput ();
 			string output = Stream2String (s);
-#if NET_1_1
 			Assert.AreEqual (c14xml3, output, "XmlDocument");
-#else
-			// .NET 1.0 keeps the \r\n (0x0D, 0x0A) - bug
-			Assert.AreEqual (c14xml1, output, "XmlDocument");
-#endif
 		}
 
 		[Test]
-#if NET_2_0
 		[Category ("NotDotNet")]
 		// see LoadInputAsXmlNodeList2 description
-#endif
 		public void LoadInputAsXmlNodeList () 
 		{
 			XmlDocument doc = GetDoc ();
@@ -205,11 +198,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 		}
 
 		[Test]
-#if NET_2_0
 		[ExpectedException (typeof (ArgumentException))]
-#else
-		// LAMESPEC: input MUST be one of InputType - but no exception is thrown (not documented)
-#endif
 		public void LoadInputWithUnsupportedType () 
 		{
 			byte[] bad = { 0xBA, 0xD };
diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
index bd70d9b2b60..50fb9ba480f 100644
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
@@ -248,19 +248,12 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 			transform.LoadInput (doc);
 			Stream s = (Stream) transform.GetOutput ();
 			string output = Stream2String (s);
-#if NET_1_1
 			Assert.AreEqual (c14xml3, output, "XmlDocument");
-#else
-			// .NET 1.0 keeps the \r\n (0x0D, 0x0A) - bug
-			Assert.AreEqual (c14xml1, output, "XmlDocument");
-#endif
 		}
 
 		[Test]
-#if NET_2_0
 		[Category ("NotDotNet")]
 		// see LoadInputAsXmlNodeList2 description
-#endif
 		public void LoadInputAsXmlNodeList () 
 		{
 			XmlDocument doc = GetDoc ();
diff --git a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
index a059752f8df..2d311a07aaf 100644
--- a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
@@ -56,11 +56,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif (NET_1_1 || NET_1_0)
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
diff --git a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
index 5d6c2006426..aaeb69ebc5f 100644
--- a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
@@ -60,14 +60,6 @@ using System.Runtime.InteropServices;
 	[assembly: AssemblyKeyFile("../msfinal.pub")]
 #endif
 
-#if NET_2_0
-	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif NET_1_1
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
-	[assembly: AssemblyTrademark ("")]
-	[assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs
index e9cb549316c..e642a6202dd 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs
@@ -42,11 +42,9 @@ namespace System.Web.Services.Configuration
 		HttpPost = 1 << 1,
 		HttpGet =  1 << 2,
 		Documentation = 1 << 3,
-#if NET_1_1
 		HttpSoap12 = 1 << 4,
 		HttpPostLocalhost = 1 << 5,
 		AnyHttpSoap = HttpSoap | HttpSoap12,
-#endif
 		All = 0xFF
 	}
 	
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
index 22d9ca7f3b6..2125fbcb239 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
@@ -104,7 +104,6 @@ namespace System.Web.Services.Description {
 			set { use = value; }
 		}
 
-#if NET_1_1
 		[MonoTODO]
 		[XmlElement ("headerfault")]
 		public SoapHeaderFaultBinding Fault 
@@ -112,7 +111,6 @@ namespace System.Web.Services.Description {
 			get { return null; }
 			set { ; }
 		}
-#endif
 
 		#endregion // Properties
 	}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
index 2b653064d91..78c1da0bf7b 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
@@ -50,9 +50,7 @@ namespace System.Web.Services.Protocols {
 		IWebProxy proxy;
 		string userAgent;
 		
-#if NET_1_1
 		bool _unsafeAuthenticated;
-#endif
 		#endregion
 
 		#region Constructors
@@ -111,26 +109,20 @@ namespace System.Web.Services.Protocols {
 		}
 
 		[WebServicesDescription ("Sets the user agent http header for the request.")]
-#if NET_2_0
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
 		public string UserAgent {
 			get { return userAgent; }
 			set { userAgent = value; }
 		}
 		
-#if NET_1_1
-#if NET_2_0
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
 		public bool UnsafeAuthenticatedConnectionSharing
 		{
 			get { return _unsafeAuthenticated; }
 			set { _unsafeAuthenticated = value; }
 		}
-#endif
 
 		#endregion // Properties
 
@@ -162,10 +154,8 @@ namespace System.Web.Services.Protocols {
 			HttpWebRequest request = req as HttpWebRequest;
 			if (request == null)
 				return req;
-#if NET_2_0
 			if (enableDecompression)
 				request.AutomaticDecompression = DecompressionMethods.GZip;
-#endif
 
 			request.AllowAutoRedirect = allowAutoRedirect;
 			if (clientCertificates != null)
@@ -177,10 +167,6 @@ namespace System.Web.Services.Protocols {
 
 			request.UserAgent = userAgent;
 
-#if NET_1_1
-		//	request.UnsafeAuthenticatedConnectionSharing = _unsafeAuthenticated;
-#endif
-
 			return request;
 		}
 
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
index 88719295f15..2eb2aedf0bf 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
@@ -63,11 +63,9 @@ namespace System.Web.Services.Protocols {
 			set { memberName = value; }
 		}
 
-#if NET_1_1
                [Obsolete ("This property will be removed from a future"
                        + " version. The presence of a particular header"
                        + " in a SOAP message is no longer enforced", false)]
-#endif
 		public bool Required {
 			get { return required; }
 			set { required = value; }
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
index c21f8ff83a1..23b2cd685be 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
@@ -34,8 +34,6 @@ namespace System.Web.Services.Protocols {
 		In = 0x1,
 		InOut = 0x3,
 		Out = 0x2,
-#if NET_1_1
 		Fault = 0x4
-#endif
 	}
 }
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
index 038cd761376..8fa269658ab 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
@@ -49,9 +49,7 @@ namespace System.Web.Services.Protocols {
 		object[] inParameters;
 		object[] outParameters;
 		
-#if NET_2_0
 		SoapProtocolVersion soapVersion;
-#endif
 
 		#endregion // Fields
 
@@ -97,9 +95,7 @@ namespace System.Web.Services.Protocols {
 
 		public SoapException Exception {
 			get { return exception; }
-#if NET_2_0
 			set { exception = value; }
-#endif
 		}
 
 		public SoapHeaderCollection Headers {
@@ -133,37 +129,23 @@ namespace System.Web.Services.Protocols {
 			get;
 		}
 		
-#if NET_1_1
 		public string ContentEncoding
 		{
 			get { return content_encoding; }
 			set { content_encoding = value; }
 		}
-#else
-		internal string ContentEncoding
-		{
-			get { return content_encoding; }
-			set { content_encoding = value; }
-		}
-#endif
 
 		internal bool IsSoap12 {
 			get {
-#if NET_2_0
 				return SoapVersion == SoapProtocolVersion.Soap12;
-#else
-				return false;
-#endif
 			}
 		}
 
-#if NET_2_0
 		[System.Runtime.InteropServices.ComVisible(false)]
 		[DefaultValue (SoapProtocolVersion.Default)]
 		public virtual SoapProtocolVersion SoapVersion {
 			get { return soapVersion; }
 		}
-#endif
  
 		internal Stream InternalStream 
 		{ 
diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
index e5d8db41ced..f5f1a2d1353 100644
--- a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -63,9 +63,7 @@ namespace System.Web.Mail
 			attachments = new ArrayList (8);
 			headers = new ListDictionary ();
 			bodyEncoding = Encoding.Default;
-#if NET_1_1
 			fields = new Hashtable ();
-#endif
 		}		
 	
 		// Properties
@@ -132,7 +130,6 @@ namespace System.Web.Mail
 			set { urlContentLocation = value; }
 		}
 
-#if NET_1_1
 		Hashtable fields;
 		
 		public IDictionary Fields {
@@ -140,6 +137,5 @@ namespace System.Web.Mail
 				return (IDictionary) fields;
 			}
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index b10fc8c57d4..3fe644e221f 100644
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -228,7 +228,6 @@ namespace System.Web.Mail {
 	    get { return message.UrlContentLocation; } 
 	}
 
-#if NET_1_1
 		public MailHeader Fields {
 			get {
 					MailHeader bodyHeaders = new MailHeader();
@@ -240,6 +239,5 @@ namespace System.Web.Mail {
 			}
 			
 		}
-#endif
     }	 
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
index 29f4325e9c7..adbcf92aa5a 100644
--- a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
@@ -223,7 +223,6 @@ namespace System.Web.Mail {
 			MailHeader partHeader = new MailHeader ();
 			partHeader.ContentType = bodyContentType;		
 
-#if NET_1_1
 			// Add all the custom headers to body part as specified in 
 			//Fields property of MailMessageWrapper
 
@@ -240,7 +239,6 @@ namespace System.Web.Mail {
 			if (msg.Fields.Data ["http://schemas.microsoft.com/cdo/configuration/sendpassword"] != null)
 				msg.Fields.Data.Remove ("http://schemas.microsoft.com/cdo/configuration/sendpassword");
 			partHeader.Data.Add (msg.Fields.Data);
-#endif
 
 			smtp.WriteHeader (partHeader);
 	  
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/PanelTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/PanelTest.cs
index 70cc8d1cb08..fbdd25c624c 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/PanelTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/PanelTest.cs
@@ -67,7 +67,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 				base.Render (writer);
 				return writer.InnerWriter.ToString ();
 			}
-#if NET_2_0
 			protected override Style CreateControlStyle ()
 			{
 				Style s = new Style (new StateBag ());
@@ -104,7 +103,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 				base.RenderEndTag (writer);
 				return writer.InnerWriter.ToString ();
 			}
-#endif
 		}
 
 		class PokerR : Panel
@@ -118,7 +116,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 				base.Render (writer);
 				return writer.InnerWriter.ToString ();
 			}
-#if NET_2_0
+
 			public override void RenderBeginTag (HtmlTextWriter writer)
 			{
 				writer.Write ("RenderBeginTag");
@@ -128,26 +126,24 @@ namespace MonoTests.System.Web.UI.WebControls {
 			{
 				writer.Write ("RenderEndTag");
 			}
-#endif
 		}
 		#endregion
-#if NET_2_0
+
 		[TestFixtureSetUp]
 		public void SetUp ()
 		{
 			WebTest.CopyResource (GetType (), "NoEventValidation.aspx", "NoEventValidation.aspx");
 		}
-#endif
+
 		[Test]
 		public void Defaults ()
 		{
 			Poker p = new Poker ();
-#if NET_2_0
+
 			Assert.AreEqual (ContentDirection.NotSet, p.Direction, "Direction"); 
 			Assert.AreEqual (string.Empty, p.GroupingText, "GroupingText");
 			Assert.AreEqual (ScrollBars.None, p.ScrollBars, "ScrollBars"); 
 			Assert.AreEqual (string.Empty, p.DefaultButton, "DefaultButton");
-#endif
 		}
 		
 		[Test]
@@ -156,15 +152,10 @@ namespace MonoTests.System.Web.UI.WebControls {
 			Poker p = new Poker ();
 			p.Wrap = false;
 			p.Controls.Add (new LiteralControl ("TEXT"));
-#if NET_2_0
 			const string html ="<div style=\"white-space:nowrap;\">\n\tTEXT\n</div>";
-#elif NET_1_1
-			const string html ="<div nowrap=\"nowrap\">\n\tTEXT\n</div>";
-#endif
 			Assert.AreEqual (html, p.Render ());
 		}
 
-#if NET_2_0
 		[Test]
 		public void CreateControlStyle ()
 		{
@@ -289,7 +280,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		{
 			WebTest.Unload ();
 		}
-#endif
 	}
 }
 
diff --git a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
index e9295b67241..7252b4b27a6 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
@@ -45,7 +45,6 @@ namespace MonoTests.System.Web {
 	[TestFixture]
 	public class HttpRequestTest {
 
-#if NET_1_1
 		[Test]
 		[ExpectedException (typeof (HttpRequestValidationException))]
 		public void ValidateInput_XSS ()
@@ -95,7 +94,6 @@ namespace MonoTests.System.Web {
 			// the next statement throws
 			Assert.AreEqual ("<SCRIPT>alert(document.cookie)</SCRIPT>", request.QueryString ["test"], "QueryString");
 		}
-#endif
 		//
 		// Tests the properties from the simple constructor.
 		[Test]
diff --git a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
index e82ece5703b..eccc9dbe634 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
@@ -732,7 +732,6 @@ namespace MonoTests.System.Web {
 			}
 		}
 
-#if NET_1_1
 		[Test]
 		public void UrlPathEncode ()
 		{
@@ -756,9 +755,7 @@ namespace MonoTests.System.Web {
 			Assert.AreEqual (s, s2, "UrlPathEncode " + s);
 		}
 
-#endif
 
-#if NET_2_0
 		[Test]
 #if TARGET_JVM
 		[Ignore ("TD #6956")]
@@ -829,7 +826,7 @@ namespace MonoTests.System.Web {
 					Assert.AreEqual (values [i] [q], tmp [q], msg + "[Value]");
 			}
 		}
-#endif
+
 		string [] decoding_pairs = {
 	@"&aacute;&Aacute;&acirc;&Acirc;&acute;&aelig;&AElig;&agrave;&Agrave;&alefsym;&alpha;&Alpha;&amp;&and;&ang;&aring;&Aring;&asymp;&atilde;&Atilde;&auml;&Auml;&bdquo;&beta;&Beta;&brvbar;&bull;&cap;&ccedil;&Ccedil;&cedil;&cent;&chi;&Chi;&circ;&clubs;&cong;&copy;&crarr;&cup;&curren;&dagger;&Dagger;&darr;&dArr;&deg;&delta;&Delta;&diams;&divide;&eacute;&Eacute;&ecirc;&Ecirc;&egrave;&Egrave;&empty;&emsp;&ensp;&epsilon;&Epsilon;&equiv;&eta;&Eta;&eth;&ETH;&euml;&Euml;&euro;&exist;&fnof;&forall;&frac12;&frac14;&frac34;&frasl;&gamma;&Gamma;&ge;&gt;&harr;&hArr;&hearts;&hellip;&iacute;&Iacute;&icirc;&Icirc;&iexcl;&igrave;&Igrave;&image;&infin;&int;&iota;&Iota;&iquest;&isin;&iuml;&Iuml;&kappa;&Kappa;&lambda;&Lambda;&lang;&laquo;&larr;&lArr;&lceil;&ldquo;&le;&lfloor;&lowast;&loz;&lrm;&lsaquo;&lsquo;&lt;&macr;&mdash;&micro;&middot;&minus;&mu;&Mu;&nabla;&nbsp;&ndash;&ne;&ni;&not;&notin;&nsub;&ntilde;&Ntilde;&nu;&Nu;&oacute;&Oacute;&ocirc;&Ocirc;&oelig;&OElig;&ograve;&Ograve;&oline;&omega;&Omega;&omicron;&Omicron;&oplus;&or;&ordf;&ordm;&oslash;&Oslash;&otilde;&Otilde;&otimes;&ouml;&Ouml;&para;&part;&permil;&perp;&phi;&Phi;&pi;&Pi;&piv;&plusmn;&pound;&prime;&Prime;&prod;&prop;&psi;&Psi;&quot;&radic;&rang;&raquo;&rarr;&rArr;&rceil;&rdquo;&real;&reg;&rfloor;&rho;&Rho;&rlm;&rsaquo;&rsquo;&sbquo;&scaron;&Scaron;&sdot;&sect;&shy;&sigma;&Sigma;&sigmaf;&sim;&spades;&sub;&sube;&sum;&sup;&sup1;&sup2;&sup3;&supe;&szlig;&tau;&Tau;&there4;&theta;&Theta;&thetasym;&thinsp;&thorn;&THORN;&tilde;&times;&trade;&uacute;&Uacute;&uarr;&uArr;&ucirc;&Ucirc;&ugrave;&Ugrave;&uml;&upsih;&upsilon;&Upsilon;&uuml;&Uuml;&weierp;&xi;&Xi;&yacute;&Yacute;&yen;&yuml;&Yuml;&zeta;&Zeta;&zwj;&zwnj;",
 	@"áÁâ´æÆàÀℵαΑ&∧∠åÅ≈ãÃäÄ„βΒ¦•∩çǸ¢χΧˆ♣≅©↵∪¤†‡↓⇓°δΔ♦÷éÉêÊèÈ∅  εΕ≡ηΗðÐëË€∃ƒ∀½¼¾⁄γΓ≥>↔⇔♥…íÍîΡìÌℑ∞∫ιΙ¿∈ïÏκΚλΛ〈«←⇐⌈“≤⌊∗◊‎‹‘<¯—µ·−μΜ∇ –≠∋¬∉⊄ñÑνΝóÓôÔœŒòÒ‾ωΩοΟ⊕∨ªºøØõÕ⊗öÖ¶∂‰⊥φΦπΠϖ±£′″∏∝ψΨ""√〉»→⇒⌉”ℜ®⌋ρΡ‏›’‚šŠ⋅§­σΣς∼♠⊂⊆∑⊃¹²³⊇ßτΤ∴θΘϑ þޘיúÚ↑⇑ûÛùÙ¨ϒυΥüÜ℘ξΞýÝ¥ÿŸζΖ‍‌",
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs b/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs
index d2dd70c82a7..6af8a615893 100644
--- a/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs
@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

-#if NET_2_0

 

 using System;

 using System.Text;

@@ -611,107 +610,6 @@ namespace Mono.Xml.XPath
 			return ret;

 		}

 

-#if NET_1_1

-#else

-		public override string ReadInnerXml ()

-		{

-			if (ReadState != ReadState.Interactive)

-				return String.Empty;

-

-			switch (NodeType) {

-			case XmlNodeType.Attribute:

-				return Value;

-			case XmlNodeType.Element:

-				if (IsEmptyElement)

-					return String.Empty;

-

-				int startDepth = Depth;

-

-				innerXmlBuilder.Length = 0;

-				bool loop = true;

-				do {

-					Read ();

-					if (NodeType ==XmlNodeType.None)

-						throw new InvalidOperationException ("unexpected end of xml.");

-					else if (NodeType == XmlNodeType.EndElement && Depth == startDepth) {

-						loop = false;

-						Read ();

-					}

-					else

-						innerXmlBuilder.Append (GetCurrentTagMarkup ());

-				} while (loop);

-				string xml = innerXmlBuilder.ToString ();

-				innerXmlBuilder.Length = 0;

-				return xml;

-			case XmlNodeType.None:

-				// MS document is incorrect. Seems not to progress.

-				return String.Empty;

-			default:

-				Read ();

-				return String.Empty;

-			}

-		}

-		

-		StringBuilder atts = new StringBuilder ();

-		private string GetCurrentTagMarkup ()

-		{

-			switch (NodeType) {

-			case XmlNodeType.CDATA:

-				return String.Format ("<![CDATA[{0}]]>", Value.Replace ("]]>", "]]&gt;"));

-			case XmlNodeType.Text:

-				return Value.Replace ("<", "&lt;");

-			case XmlNodeType.Comment:

-				return String.Format ("<!--{0}-->", Value);

-			case XmlNodeType.SignificantWhitespace:

-			case XmlNodeType.Whitespace:

-				return Value;

-			case XmlNodeType.EndElement:

-				return String.Format ("</{0}>", Name);

-			}

-

-			bool isEmpty = IsEmptyElement;

-			string name = Name;

-			atts.Length = 0;

-			XPathNavigator temp = current.Clone ();

-			while (temp.MoveToNextAttribute ())

-				atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));

-			if (!IsEmptyElement)

-				return String.Format ("<{0}{1}>", name, atts);

-			else

-				return String.Format ("<{0}{1} />", name, atts);

-		}

-

-		// Arranged copy of XmlTextReader.ReadOuterXml()

-		public override string ReadOuterXml ()

-		{

-			if (ReadState != ReadState.Interactive)

-				return String.Empty;

-

-			switch (NodeType) {

-			case XmlNodeType.Attribute:

-				// strictly incompatible with MS... (it holds spaces attribute between name, value and "=" char (very trivial).

-				return String.Format ("{0}={1}{2}{1}", Name, QuoteChar, ReadInnerXml ());

-			case XmlNodeType.Element:

-				bool isEmpty = IsEmptyElement;

-				string name = Name;

-				StringBuilder atts = new StringBuilder ();

-				XPathNavigator temp = current.Clone ();

-				while (temp.MoveToNextAttribute ())

-					atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));

-

-				if (!isEmpty)

-					return String.Format ("{0}{1}</{2}>", GetCurrentTagMarkup (), atts, ReadInnerXml (), name);

-				else

-					return String.Format ("{0}", GetCurrentTagMarkup ());

-			case XmlNodeType.None:

-				// MS document is incorrect. Seems not to progress.

-				return String.Empty;

-			default:

-				Read ();

-				return String.Empty;

-			}

-		}

-#endif

 

 		public override string LookupNamespace (string prefix)

 		{

@@ -749,5 +647,3 @@ namespace Mono.Xml.XPath
 		#endregion

 	}

 }

-

-#endif

diff --git a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
index 43d46d557e3..24494382aba 100644
--- a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
+++ b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
@@ -256,19 +256,6 @@ namespace Mono.Xml
 			return reader.ReadString ();

 		}

 

-#if NET_1_1

-#else

-		public override string ReadInnerXml ()

-		{

-			return ReadInnerXmlInternal ();

-		}

-

-		public override string ReadOuterXml ()

-		{

-			return ReadOuterXmlInternal ();

-		}

-#endif

-

 		public override string LookupNamespace (string prefix)

 		{

 			return reader.LookupNamespace (prefix);

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
index 83d48be1d21..2e7b2781343 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
@@ -266,22 +266,14 @@ namespace System.Xml.Schema
 		///             4. targetNamespace should be any uri
 		///             5. version should be a normalizedString
 		/// </remarks>
-#if NET_2_0
 		[Obsolete ("Use XmlSchemaSet.Compile() instead.")]
-#endif
 		public void Compile (ValidationEventHandler handler)
 		{
 			Compile (handler, new XmlUrlResolver ());
 		}
 
-#if NET_2_0
 		[Obsolete ("Use XmlSchemaSet.Compile() instead.")]
-#endif
-#if NET_1_1
 		public void Compile (ValidationEventHandler handler, XmlResolver resolver)
-#else
-		internal void Compile (ValidationEventHandler handler, XmlResolver resolver)
-#endif
 		{
 			XmlSchemaSet xss = new XmlSchemaSet ();
 			if (handler != null)
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
index 8b724c53009..e572e06dbf6 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
@@ -99,11 +99,7 @@ namespace System.Xml.Schema
 			return Add (ns, reader, new XmlUrlResolver ());
 		}
 
-#if NET_1_1
 		public XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
-#else
-		internal XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
-#endif
 		{
 			XmlSchema schema = XmlSchema.Read (reader, ValidationEventHandler);
 			if (schema.TargetNamespace == null)
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
index 3e1228f6cee..e61c599490b 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
@@ -122,7 +122,6 @@ namespace System.Xml.Serialization
 			get { return _form; }
 		}
 		
-#if NET_2_0
 		public string XsdElementName
 		{
 			get { return _mapMember.Name; }
@@ -135,15 +134,11 @@ namespace System.Xml.Serialization
 				"System.Nullable`1[" + ret + "]" : ret;
 		}
 #endif
-#endif
 
-#if NET_1_1
 		public bool CheckSpecified
 		{
 			get { return _mapMember.IsOptionalValueType; }
 		}
-#endif
-
 		#endregion // Properties
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
index 89bd52402df..ad4bae1f36f 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
@@ -587,11 +587,7 @@ namespace System.Xml.Serialization
 		protected void WriteNullTagEncoded (string name, string ns)
 		{
 			Writer.WriteStartElement (name, ns);
-#if NET_1_1
 			Writer.WriteAttributeString ("nil", XmlSchema.InstanceNamespace, "true");
-#else
-			Writer.WriteAttributeString ("null", XmlSchema.InstanceNamespace, "1");
-#endif
 			Writer.WriteEndElement ();
 		}
 
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
index a83b7ee80bc..2610a90c281 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
@@ -111,10 +111,6 @@ namespace System.Xml.Xsl {
 		XmlResolver xmlResolver = new XmlUrlResolver ();

 

 		[MonoTODO] // FIXME: audit security check

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public XmlResolver XmlResolver {

 			set {

 				 xmlResolver = value;

@@ -122,37 +118,22 @@ namespace System.Xml.Xsl {
 		}

 		

 		#region Transform

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public XmlReader Transform (IXPathNavigable input, XsltArgumentList args)

 		{

 			return Transform (input.CreateNavigator (), args, xmlResolver);

 		}

 

-#if NET_1_1

 		public XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver)

-#else

-		XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver)

-#endif

 		{

 			return Transform (input.CreateNavigator (), args, resolver);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public XmlReader Transform (XPathNavigator input, XsltArgumentList args)

 		{

 			return Transform (input, args, xmlResolver);

 		}

-#if NET_1_1

+

 		public XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver)

-#else

-		XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver)

-#endif

 		{

 			// todo: is this right?

 			MemoryStream stream = new MemoryStream ();

@@ -161,70 +142,41 @@ namespace System.Xml.Xsl {
 			return new XmlTextReader (stream, XmlNodeType.Element, null);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output)

 		{

 			Transform (input.CreateNavigator (), args, output, xmlResolver);

 		}

-#if NET_1_1

+

 		public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver)

-#else

-		void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver)

-#endif

 		{

 			Transform (input.CreateNavigator (), args, output, resolver);

 		}

 		

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output)

 		{

 			Transform (input.CreateNavigator (), args, output, xmlResolver);

 		}

-#if NET_1_1

 		public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver)

-#else

-		void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver)

-#endif

 		{

 			Transform (input.CreateNavigator (), args, output, resolver);

 		}

 		

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output)

 		{

 			Transform (input.CreateNavigator (), args, output, xmlResolver);

 		}

-#if NET_1_1

+

 		public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)

-#else

-		void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)

-#endif

 		{

 			Transform (input.CreateNavigator (), args, output, resolver);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output)

 		{

 			Transform (input, args, output, xmlResolver);

 		}

-#if NET_1_1

+

 		public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)

-#else

-		void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)

-#endif

 		{

 			if (s == null)

 				throw new XsltException ("No stylesheet was loaded.", null);

@@ -234,37 +186,22 @@ namespace System.Xml.Xsl {
 			output.Flush ();

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (XPathNavigator input, XsltArgumentList args, Stream output)

 		{

 			Transform (input, args, output, xmlResolver);		

 		}

-#if NET_1_1

 		public void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver)

-#else

-		void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver)

-#endif

 		{

 			XslOutput xslOutput = (XslOutput)s.Outputs[String.Empty];

 			Transform (input, args, new StreamWriter (output, xslOutput.Encoding), resolver);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output)

 		{

 			Transform (input, args, output, xmlResolver);

 		}

-#if NET_1_1

+

 		public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver)

-#else

-		void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver)

-#endif

 		{

 			if (s == null)

 				throw new XsltException ("No stylesheet was loaded.", null);

@@ -275,20 +212,12 @@ namespace System.Xml.Xsl {
 			output.Flush ();

 		}

 		

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

-#endif

 		public void Transform (string inputfile, string outputfile)

 		{ 

 			Transform (inputfile, outputfile, xmlResolver);

 		}

 

-#if NET_1_1

 		public void Transform (string inputfile, string outputfile, XmlResolver resolver)

-#else

-		void Transform (string inputfile, string outputfile, XmlResolver resolver)

-#endif

 		{

 			using (Stream s = new FileStream (outputfile, FileMode.Create, FileAccess.ReadWrite)) {

 				Transform(new XPathDocument (inputfile).CreateNavigator (), null, s, resolver);

@@ -318,84 +247,48 @@ namespace System.Xml.Xsl {
 			}

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (XmlReader stylesheet)

 		{

 			Load (stylesheet, null, null);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (XmlReader stylesheet, XmlResolver resolver)

 		{

 			Load (stylesheet, resolver, null);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (XPathNavigator stylesheet)

 		{

 			Load (stylesheet, null, null);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (XPathNavigator stylesheet, XmlResolver resolver)

 		{

 			Load (stylesheet, resolver, null);

 		}

 		

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (IXPathNavigable stylesheet)

 		{

 			Load (stylesheet.CreateNavigator(), null);

 		}

 

-#if NET_2_0

-#elif NET_1_1

-		[Obsolete("You should pass evidence.", false)]

-#endif

 		public void Load (IXPathNavigable stylesheet, XmlResolver resolver)

 		{

 			Load (stylesheet.CreateNavigator(), resolver);

 		}

 

 		// Introduced in .NET 1.1

-#if NET_1_1

 		public void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence)

-#else

-		internal void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence)

-#endif

 		{

 			Load (stylesheet.CreateNavigator(), resolver, evidence);

 		}

 

-#if NET_1_1

 		public void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence)

-#else

-		internal void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence)

-#endif

 		{

 			s = new Compiler (debugger).Compile (stylesheet, resolver, evidence);

 		}

 

-#if NET_1_1

 		public void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence)

-#else

-		internal void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence)

-#endif

 		{

 			Load (new XPathDocument (stylesheet, XmlSpace.Preserve).CreateNavigator (), resolver, evidence);

 		}

diff --git a/mcs/class/System.XML/System.Xml/XmlInputStream.cs b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
index 01e0ab0461e..ff8d3341916 100644
--- a/mcs/class/System.XML/System.Xml/XmlInputStream.cs
+++ b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
@@ -63,15 +63,9 @@ namespace System.Xml
 			try {
 				return base.Read (dest_buffer, index, count);
 			}
-#if NET_1_1
 			catch (System.ArgumentException ex) {
 				throw new XmlException ("Invalid data", ex);
 			}
-#else
-			catch (System.Text.DecoderFallbackException) {
-				throw invalidDataException;
-			}
-#endif
 		}
 
 		protected override void Dispose (bool disposing)
diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs b/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
index 287dbe7856f..618ac25d030 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
@@ -139,13 +139,7 @@ Here are some implementation notes (mostly common to previous module):
 	closing '>' is written).
 
 */
-
-
-#if NET_1_1
 namespace System.Xml
-#else
-namespace Mono.Xml
-#endif
 {
 	public class XmlTextWriter : XmlWriter
 	{
@@ -268,7 +262,6 @@ namespace Mono.Xml
 			allow_doc_fragment = true;
 		}
 
-#if NET_2_0
 		internal XmlTextWriter (
 			TextWriter writer, XmlWriterSettings settings, bool closeOutput)
 		{
@@ -312,7 +305,6 @@ namespace Mono.Xml
 			check_character_validity = settings.CheckCharacters;
 			namespace_handling = settings.NamespaceHandling;
 		}
-#endif
 
 		void Initialize (TextWriter writer)
 		{
@@ -336,7 +328,6 @@ namespace Mono.Xml
 				new char [] {'"', '&', '<', '>' };
 		}
 
-#if NET_2_0
 		// 2.0 XmlWriterSettings support
 
 		// As for ConformanceLevel, MS.NET is inconsistent with
@@ -345,8 +336,6 @@ namespace Mono.Xml
 		// result in an error.
 		// ms-help://MS.NETFramework.v20.en/wd_xml/html/7db8802b-53d8-4735-a637-4d2d2158d643.htm
 
-#endif
-
 		// Literal Output Control
 
 		public Formatting Formatting {
@@ -432,17 +421,12 @@ namespace Mono.Xml
 
 		public override void Close ()
 		{
-#if NET_2_0
 			if (state != WriteState.Error) {
-#endif
 				if (state == WriteState.Attribute)
 					WriteEndAttribute ();
 				while (open_count > 0)
 					WriteEndElement ();
-#if NET_2_0
 			}
-#endif
-
 			if (close_output_stream)
 				writer.Close ();
 			else
@@ -517,9 +501,7 @@ namespace Mono.Xml
 		public override void WriteEndDocument ()
 		{
 			switch (state) {
-#if NET_2_0
 			case WriteState.Error:
-#endif
 			case WriteState.Closed:
 			case WriteState.Start:
 				throw StateError ("EndDocument");
@@ -589,11 +571,7 @@ namespace Mono.Xml
 		public override void WriteStartElement (
 			string prefix, string localName, string namespaceUri)
 		{
-#if NET_2_0
 			if (state == WriteState.Error || state == WriteState.Closed)
-#else
-			if (state == WriteState.Closed)
-#endif
 				throw StateError ("StartTag");
 			node_state = XmlNodeType.Element;
 
@@ -765,11 +743,7 @@ namespace Mono.Xml
 
 		void WriteEndElementCore (bool full)
 		{
-#if NET_2_0
 			if (state == WriteState.Error || state == WriteState.Closed)
-#else
-			if (state == WriteState.Closed)
-#endif
 				throw StateError ("EndElement");
 			if (open_count == 0)
 				throw InvalidOperation ("There is no more open element.");
@@ -1309,9 +1283,7 @@ namespace Mono.Xml
 		void ShiftStateTopLevel (string occured, bool allowAttribute, bool dontCheckXmlDecl, bool isCharacter)
 		{
 			switch (state) {
-#if NET_2_0
 			case WriteState.Error:
-#endif
 			case WriteState.Closed:
 				throw StateError (occured);
 			case WriteState.Start:
@@ -1350,9 +1322,7 @@ namespace Mono.Xml
 		void ShiftStateContent (string occured, bool allowAttribute)
 		{
 			switch (state) {
-#if NET_2_0
 			case WriteState.Error:
-#endif
 			case WriteState.Closed:
 					throw StateError (occured);
 			case WriteState.Prolog:
@@ -1505,25 +1475,19 @@ namespace Mono.Xml
 
 		Exception ArgumentOutOfRangeError (string name)
 		{
-#if NET_2_0
 			state = WriteState.Error;
-#endif
 			return new ArgumentOutOfRangeException (name);
 		}
 
 		Exception ArgumentError (string msg)
 		{
-#if NET_2_0
 			state = WriteState.Error;
-#endif
 			return new ArgumentException (msg);
 		}
 
 		Exception InvalidOperation (string msg)
 		{
-#if NET_2_0
 			state = WriteState.Error;
-#endif
 			return new InvalidOperationException (msg);
 		}
 
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs b/mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs
index 785f5a13d38..18cef9df486 100644
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs
@@ -414,9 +414,7 @@ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl='urn:schemas-micros
 
 		// http://support.microsoft.com/default.aspx?scid=kb;en-us;834667
 		[Test]
-#if NET_1_1
 		[Category ("NotDotNet")]
-#endif
 		public void LocalParameter ()
 		{
 			string xsltFragment = @"<?xml version=""1.0"" encoding=""UTF-8"" ?>
diff --git a/mcs/class/System/System.Net.Sockets/IPv6MulticastOption.cs b/mcs/class/System/System.Net.Sockets/IPv6MulticastOption.cs
index 9b3631bd4a9..3db9e6c5550 100644
--- a/mcs/class/System/System.Net.Sockets/IPv6MulticastOption.cs
+++ b/mcs/class/System/System.Net.Sockets/IPv6MulticastOption.cs
@@ -33,7 +33,6 @@ using System.Net;
 
 namespace System.Net.Sockets
 {
-#if NET_1_1
 	// <remarks>
 	//   Encapsulates a multicast option
 	// </remarks>
@@ -80,5 +79,4 @@ namespace System.Net.Sockets
 			}
 		}
 	}
-#endif
 }
diff --git a/mcs/class/System/System.Net.Sockets/ProtocolType.cs b/mcs/class/System/System.Net.Sockets/ProtocolType.cs
index 90a06d12024..824e912c308 100644
--- a/mcs/class/System/System.Net.Sockets/ProtocolType.cs
+++ b/mcs/class/System/System.Net.Sockets/ProtocolType.cs
@@ -70,11 +70,9 @@ namespace System.Net.Sockets {
 		/// </summary>
 		Idp = 22,
 
-#if NET_1_1
 		/// <summary>
 		/// </summary>
 		IPv6 = 41,
-#endif
 
 		/// <summary>
 		/// </summary>
diff --git a/mcs/class/System/System.Net.Sockets/Socket.jvm.cs b/mcs/class/System/System.Net.Sockets/Socket.jvm.cs
index c6eabc50aee..e4de7bf54ea 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.jvm.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.jvm.cs
@@ -918,7 +918,6 @@ namespace System.Net.Sockets
 			}
 		}
 
-#if NET_1_1
 		public static bool SupportsIPv4 
 		{
 			get 
@@ -936,23 +935,6 @@ namespace System.Net.Sockets
 				return ipv6Supported == 1;
 			}
 		}
-#else
-		internal static bool SupportsIPv4 
-		{
-			get 
-			{
-				return true;
-			}
-		}
-
-		internal static bool SupportsIPv6 
-		{
-			get 
-			{
-				return false;
-			}
-		}
-#endif
 
 		internal static void CheckProtocolSupport()
 		{
@@ -973,7 +955,7 @@ namespace System.Net.Sockets
 
 			if(ipv6Supported == -1) 
 			{
-#if NET_2_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
 				SettingsSection config;
 				config = (SettingsSection) System.Configuration.ConfigurationManager.GetSection ("system.net/settings");
 				if (config != null)
diff --git a/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs b/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
index e93bb2f4b04..cda7027a7f7 100644
--- a/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
+++ b/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
@@ -46,11 +46,9 @@ namespace System.Net.Sockets {
 		/// </summary>
 		IP = 0,
 
-#if NET_1_1
 		/// <summary>
 		/// </summary>
 		IPv6 = 41,
-#endif
 
 		/// <summary>
 		/// </summary>
diff --git a/mcs/class/System/System.Net/IPEndPoint.cs b/mcs/class/System/System.Net/IPEndPoint.cs
index a1f6a6cf680..a6982a1ed7a 100644
--- a/mcs/class/System/System.Net/IPEndPoint.cs
+++ b/mcs/class/System/System.Net/IPEndPoint.cs
@@ -117,7 +117,6 @@ namespace System.Net {
 
 					ipe = new IPEndPoint(address, port);
 					break;
-#if NET_1_1
 				case AddressFamily.InterNetworkV6:
 					if (size < 28) {
 						return(null);
@@ -144,7 +143,6 @@ namespace System.Net {
 
 					ipe = new IPEndPoint (new IPAddress(addressData, scopeId), port);
 					break;
-#endif
 				default:
 					return null;
 			}
@@ -173,7 +171,7 @@ namespace System.Net {
 					sockaddr [6] = (byte) ((addr >> 16) & 0xff);
 					sockaddr [7] = (byte) ((addr >> 24) & 0xff);
 					break;
-#if NET_1_1
+
 				case AddressFamily.InterNetworkV6:
 					sockaddr = new SocketAddress(AddressFamily.InterNetworkV6, 28);
 
@@ -189,7 +187,6 @@ namespace System.Net {
 					sockaddr [26] = (byte) ((address.ScopeId >> 16) & 0xff);
 					sockaddr [27] = (byte) ((address.ScopeId >> 24) & 0xff);
 					break;
-#endif
 			}
 
 			return(sockaddr);
diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs
index 3e35e93a867..02eb05e873b 100644
--- a/mcs/class/System/System.Net/ServicePointManager.cs
+++ b/mcs/class/System/System.Net/ServicePointManager.cs
@@ -114,14 +114,12 @@ namespace System.Net
 		private static bool _checkCRL = false;
 		private static SecurityProtocolType _securityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
 
-#if NET_1_1
 #if TARGET_JVM
 		static bool expectContinue = false;
 #else
 		static bool expectContinue = true;
 #endif
 		static bool useNagle;
-#endif
 		static RemoteCertificateValidationCallback server_cert_cb;
 		static bool tcp_keepalive;
 		static int tcp_keepalive_time;
@@ -270,7 +268,6 @@ namespace System.Net
 			}
 		}
 
-#if NET_1_1
 		public static bool Expect100Continue {
 			get { return expectContinue; }
 			set { expectContinue = value; }
@@ -280,7 +277,7 @@ namespace System.Net
 			get { return useNagle; }
 			set { useNagle = value; }
 		}
-#endif
+
 		// Methods
 		public static void SetTcpKeepAlive (bool enabled, int keepAliveTime, int keepAliveInterval)
 		{
diff --git a/mcs/class/System/System.Net/WebConnectionGroup.cs b/mcs/class/System/System.Net/WebConnectionGroup.cs
index 80cf2342a54..39253cbad22 100644
--- a/mcs/class/System/System.Net/WebConnectionGroup.cs
+++ b/mcs/class/System/System.Net/WebConnectionGroup.cs
@@ -115,13 +115,12 @@ namespace System.Net
 				cnc_cred.Password != req_cred.Password) {
 				needs_reset = true;
 			}
-#if NET_1_1
+
 			if (!needs_reset) {
 				bool req_sharing = request.UnsafeAuthenticatedConnectionSharing;
 				bool cnc_sharing = cnc.UnsafeAuthenticatedConnectionSharing;
 				needs_reset = (req_sharing == false || req_sharing != cnc_sharing);
 			}
-#endif
 			if (needs_reset) {
 				cnc.Close (false); // closes the authenticated connection
 				cnc.ResetNtlm ();
diff --git a/mcs/class/System/System.Net/WebExceptionStatus.cs b/mcs/class/System/System.Net/WebExceptionStatus.cs
index ceeadb9108e..32fa1af8ea2 100644
--- a/mcs/class/System/System.Net/WebExceptionStatus.cs
+++ b/mcs/class/System/System.Net/WebExceptionStatus.cs
@@ -53,16 +53,13 @@ namespace System.Net
 		Timeout = 14,
 		ProxyNameResolutionFailure = 15,
 
-#if NET_1_1
+
 		UnknownError = 16,
 		MessageLengthLimitExceeded = 17,
-#endif
 
-#if NET_2_0
 		CacheEntryNotFound = 18,
 		RequestProhibitedByCachePolicy = 19,
 		RequestProhibitedByProxy = 20,
-#endif
 
 	}
 }
diff --git a/mcs/class/System/System.Web/AspNetHostingPermission.cs b/mcs/class/System/System.Web/AspNetHostingPermission.cs
index f139599f97b..d1076a3271d 100644
--- a/mcs/class/System/System.Web/AspNetHostingPermission.cs
+++ b/mcs/class/System/System.Web/AspNetHostingPermission.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Security;
 using System.Security.Permissions;
 
@@ -161,5 +159,3 @@ namespace System.Web {
 		}
 	}
 }
-
-#endif
diff --git a/mcs/class/System/System.Web/AspNetHostingPermissionAttribute.cs b/mcs/class/System/System.Web/AspNetHostingPermissionAttribute.cs
index 80b59455f3e..8a299d48b06 100644
--- a/mcs/class/System/System.Web/AspNetHostingPermissionAttribute.cs
+++ b/mcs/class/System/System.Web/AspNetHostingPermissionAttribute.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Security;
 using System.Security.Permissions;
 
@@ -67,5 +65,3 @@ namespace System.Web {
 		}
 	}
 }
-
-#endif
diff --git a/mcs/class/System/System.Web/AspNetHostingPermissionLevel.cs b/mcs/class/System/System.Web/AspNetHostingPermissionLevel.cs
index beeb1959f57..4fa8edb2531 100644
--- a/mcs/class/System/System.Web/AspNetHostingPermissionLevel.cs
+++ b/mcs/class/System/System.Web/AspNetHostingPermissionLevel.cs
@@ -26,13 +26,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 namespace System.Web {
 
-#if NET_2_0
 	[Serializable]
-#endif
 	public enum AspNetHostingPermissionLevel {
 		None = 100,
 		Minimal = 200,
@@ -42,5 +38,3 @@ namespace System.Web {
 		Unrestricted = 600
 	}
 }
-
-#endif
diff --git a/mcs/class/System/Test/System.Net/IPAddressTest.cs b/mcs/class/System/Test/System.Net/IPAddressTest.cs
index 86d287acf08..650775db37b 100644
--- a/mcs/class/System/Test/System.Net/IPAddressTest.cs
+++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs
@@ -150,7 +150,6 @@ public class IPAddressTest
 		Assert.AreEqual ("255.255.255.255", IPAddress.None.ToString (), "#5");
 	}
 
-#if NET_1_1
 	[Test]
 	public void ToStringV6 ()
 	{
@@ -162,7 +161,6 @@ public class IPAddressTest
 			Assert.AreEqual (ipv6AddressList[i*2].ToLower(), addr, "ToStringIPv6 #" + i);
 		}
 	}
-#endif
 
 	[Test]
 	public void IsLoopbackV4 ()
@@ -179,7 +177,6 @@ public class IPAddressTest
 		Assert.IsFalse (IPAddress.IsLoopback (ip), "#4");
 	}
 
-#if NET_1_1
 	[Test]
 	public void IsLoopbackV6 ()
 	{
@@ -218,7 +215,6 @@ public class IPAddressTest
 		for (int i = 0; i < dataIn.Length; i++)
 			Assert.AreEqual (dataOut [i], dataIn [i], "GetAddressBytesV6 #2");
 	}
-#endif
 
 	[Test]
 	public void Address ()
@@ -257,7 +253,6 @@ public class IPAddressTest
 		}
 	}
 
-#if NET_1_1
 	[Test]
 	public void ParseOkV6 ()
 	{
@@ -278,7 +273,6 @@ public class IPAddressTest
 					ip.ToString ().ToLower (), source));
 		}
 	}
-#endif
 
 	[Test]
 	public void ParseWrongV4 ()
@@ -363,22 +357,9 @@ public class IPAddressTest
 	public void Constructor0_Address_4Byte ()
 	{
 		byte[] bytes = new byte[4] { 192, 202, 112, 37 };
-#if NET_2_0
 		IPAddress i = new IPAddress (bytes);
 		Assert.AreEqual (bytes, i.GetAddressBytes (), "#1");
 		Assert.AreEqual ("192.202.112.37", i.ToString (), "#2");
-#else
-		try {
-			new IPAddress (bytes);
-			Assert.Fail ("#1");
-		} catch (ArgumentException ex) {
-			Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
-			Assert.IsNotNull (ex.Message, "#3");
-			Assert.AreEqual ("address", ex.Message, "#4");
-			Assert.IsNull (ex.ParamName, "#5");
-			Assert.IsNull (ex.InnerException, "#6");
-		}
-#endif
 	}
 
 	[Test]
@@ -394,14 +375,9 @@ public class IPAddressTest
 			Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
 			Assert.IsNull (ex.InnerException, "#A3");
 			Assert.IsNotNull (ex.Message, "#A4");
-#if NET_2_0
 			Assert.IsFalse (ex.Message == "address", ex.Message, "#A5");
 			Assert.IsNotNull (ex.ParamName, "#A6");
 			Assert.AreEqual ("address", ex.ParamName, "#A7");
-#else
-			Assert.AreEqual ("address", ex.Message, "#A5");
-			Assert.IsNull (ex.ParamName, "#A6");
-#endif
 		}
 
 		try {
@@ -411,14 +387,9 @@ public class IPAddressTest
 			Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
 			Assert.IsNull (ex.InnerException, "#B3");
 			Assert.IsNotNull (ex.Message, "#B4");
-#if NET_2_0
 			Assert.IsFalse (ex.Message == "address", ex.Message, "#B5");
 			Assert.IsNotNull (ex.ParamName, "#B6");
 			Assert.AreEqual ("address", ex.ParamName, "#B7");
-#else
-			Assert.AreEqual ("address", ex.Message, "#B5");
-			Assert.IsNull (ex.ParamName, "#B6");
-#endif
 		}
 
 		try {
@@ -428,14 +399,9 @@ public class IPAddressTest
 			Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#C2");
 			Assert.IsNull (ex.InnerException, "#C3");
 			Assert.IsNotNull (ex.Message, "#C4");
-#if NET_2_0
 			Assert.IsFalse (ex.Message == "address", "#C5");
 			Assert.IsNotNull (ex.ParamName, "#C6");
 			Assert.AreEqual ("address", ex.ParamName, "#C7");
-#else
-			Assert.AreEqual ("address", ex.Message, "#C5");
-			Assert.IsNull (ex.ParamName, "#C6");
-#endif
 		}
 	}
 
@@ -467,14 +433,9 @@ public class IPAddressTest
 			Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
 			Assert.IsNull (ex.InnerException, "#3");
 			Assert.IsNotNull (ex.Message, "#4");
-#if NET_2_0
 			Assert.IsFalse (ex.Message == "address", "#5");
 			Assert.IsNotNull (ex.ParamName, "#6");
 			Assert.AreEqual ("address", ex.ParamName, "#7");
-#else
-			Assert.AreEqual ("address", ex.Message, "#5");
-			Assert.IsNull (ex.ParamName, "#6");
-#endif
 		}
 	}
 
@@ -492,7 +453,6 @@ public class IPAddressTest
 		}
 	}
 
-#if NET_2_0
 	[Test]
 	public void FromBytes1 ()
 	{
@@ -605,7 +565,6 @@ public class IPAddressTest
 		Assert.IsTrue (IPAddress.Parse ("FF01::1").IsIPv6Multicast, "#2");
 		Assert.IsFalse (IPAddress.Parse ("FE00::1").IsIPv6Multicast, "#3");
 	}
-#endif
 }
 }
 
diff --git a/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs b/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
index 950a08ef0ad..0a273dacc8f 100644
--- a/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
+++ b/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
@@ -107,11 +107,7 @@ namespace System.Collections
 #endif
 		}
 
-#if NET_1_1
 		public
-#else
-		internal
-#endif
 		static CaseInsensitiveHashCodeProvider DefaultInvariant {
 			get {
 				return singletonInvariant;
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
index 5b95e94dd1e..39ac038dd88 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
@@ -48,13 +48,8 @@ namespace System.Runtime.InteropServices {
 		public bool PreserveSig;
 		public bool SetLastError;
 
-#if NET_1_1
 		public bool BestFitMapping;
 		public bool ThrowOnUnmappableChar;
-#else
-		private bool BestFitMapping;
-		private bool ThrowOnUnmappableChar;
-#endif
 		#endregion
 
 		public string Value {
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs b/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
index 3e9780a9885..29e234bf547 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.IO;
 using System.Globalization;
 using System.Reflection;
@@ -137,4 +135,3 @@ namespace System.Runtime.InteropServices
 	}
 }
 
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyBuilder.cs b/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyBuilder.cs
index ac80562f233..db444ea3008 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyBuilder.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
 			IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
 	}
 }
-
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyName.cs b/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyName.cs
index a4ae7a34e9b..ab72a0da60b 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyName.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_AssemblyName.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
 			IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
 	}
 }
-
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_Attribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/_Attribute.cs
index c162d9dd111..46671e3d00e 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_Attribute.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_Attribute.cs
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System;
 
 namespace System.Runtime.InteropServices {
@@ -48,5 +46,3 @@ namespace System.Runtime.InteropServices {
 			IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
 	}
 }
-
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorBuilder.cs b/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorBuilder.cs
index 622a0dcf706..bc8f5fbbf35 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorBuilder.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorBuilder.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
 			IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
 	}
 }
-
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorInfo.cs
index 5515f46b9c0..c11dbac76c5 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_ConstructorInfo.cs
@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  (kazuki@panicode.com)
 //
 
-#if NET_1_1
-
 using System;
 using System.Globalization;
 using System.Reflection;
@@ -96,4 +94,3 @@ namespace System.Runtime.InteropServices
 		Type ReflectedType {get;}
 	}
 }
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_MemberInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/_MemberInfo.cs
index 4e745e55ccf..0b7e269fbf6 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/_MemberInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_MemberInfo.cs
@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  (kazuki@panicode.com)
 //
 
-#if NET_1_1
-
 using System;
 using System.Reflection;
 
@@ -51,4 +49,3 @@ namespace System.Runtime.InteropServices
 			IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
 	}
 }
-#endif
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
index 0d9f6142602..d15ea7d943f 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
@@ -403,10 +403,8 @@ namespace System.Runtime.Remoting.Channels
 				return null;
 			}
 			
-#if NET_1_1
 			if (RemotingConfiguration.CustomErrorsEnabled (IsLocalCall (msg)))
 				replySink = new ExceptionFilterSink (msg, replySink);
-#endif
 			
 			return _crossContextSink.AsyncProcessMessage (msg, replySink);		
 		}
@@ -425,7 +423,6 @@ namespace System.Runtime.Remoting.Channels
 
 		internal static IMessage CheckReturnMessage (IMessage callMsg, IMessage retMsg)
 		{
-#if NET_1_1
 			IMethodReturnMessage ret = retMsg as IMethodReturnMessage;
 			if (ret != null && ret.Exception != null)
 			{
@@ -435,7 +432,6 @@ namespace System.Runtime.Remoting.Channels
 					retMsg = new MethodResponse (ex, (IMethodCallMessage)callMsg);
 				}
 			}
-#endif
 			return retMsg;
 		}
 		
diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
index 46e71422e04..33fef7a0a8d 100644
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
@@ -364,14 +364,12 @@ namespace System.Runtime.Remoting
 			}
 		}
 		
-#if NET_1_1
 		public static bool CustomErrorsEnabled (bool isLocalRequest)
 		{
 			if (_errorMode == "off") return false;
 			if (_errorMode == "on") return true;
 			return !isLocalRequest;
 		}
-#endif
 
 		internal static void SetCustomErrorsMode (string mode)
 		{
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
index fd9c53307f1..e3962a3b715 100644
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
@@ -46,9 +46,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 		StreamingContext _context;
 		SerializationBinder _binder;
 		
-#if NET_1_1
 		TypeFilterLevel _filterLevel;
-#endif
 
 		ObjectManager _manager;
 		Hashtable _registeredAssemblies = new Hashtable();
@@ -84,9 +82,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 			_binder = formatter.Binder;
 			_manager = new ObjectManager (_surrogateSelector, _context);
 			
-#if NET_1_1
 			_filterLevel = formatter.FilterLevel;
-#endif
 		}
 
 		public void ReadObjectGraph (BinaryReader reader, bool readHeaders, out object result, out Header[] headers)
@@ -701,10 +697,6 @@ namespace System.Runtime.Serialization.Formatters.Binary
 							
 						if (field != null)
 							metadata.MemberInfos [n] = field;
-#if ONLY_1_1
-						else
-							throw new SerializationException ("Field \"" + names[n] + "\" not found in class " + metadata.Type.FullName);
-#endif
 						
 						if (!hasTypeInfo) {
 							types [n] = field.FieldType;
diff --git a/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
index 41951ff66cc..3a1270cbd66 100644
--- a/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
@@ -92,10 +92,8 @@ namespace System.Security.Cryptography {
 			persistKey = (parameters != null);
 			if (parameters == null) {
 				parameters = new CspParameters (PROV_DSS_DH);
-#if NET_1_1
 				if (useMachineKeyStore)
 					parameters.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
 				store = new KeyPairPersistence (parameters);
 				// no need to load - it cannot exists
 			}
@@ -137,14 +135,12 @@ namespace System.Security.Cryptography {
 			get { return "http://www.w3.org/2000/09/xmldsig#dsa-sha1"; }
 		}
 
-#if NET_1_1
 		private static bool useMachineKeyStore = false;
 
 		public static bool UseMachineKeyStore {
 			get { return useMachineKeyStore; }
 			set { useMachineKeyStore = value; }
 		}
-#endif
 
 		public override DSAParameters ExportParameters (bool includePrivateParameters) 
 		{
diff --git a/mcs/class/corlib/System.Security.Cryptography/RSACryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/RSACryptoServiceProvider.cs
index f1a3d2daa09..bf4de13a909 100644
--- a/mcs/class/corlib/System.Security.Cryptography/RSACryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RSACryptoServiceProvider.cs
@@ -98,10 +98,8 @@ namespace System.Security.Cryptography {
 			persistKey = (p != null);
 			if (p == null) {
 				p = new CspParameters (PROV_RSA_FULL);
-#if NET_1_1
 				if (useMachineKeyStore)
 					p.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
 				store = new KeyPairPersistence (p);
 				// no need to load - it cannot exists
 			}
@@ -120,14 +118,12 @@ namespace System.Security.Cryptography {
 			}
 		}
 
-#if NET_1_1
 		private static bool useMachineKeyStore = false;
 
 		public static bool UseMachineKeyStore {
 			get { return useMachineKeyStore; }
 			set { useMachineKeyStore = value; }
 		}
-#endif
 	
 		~RSACryptoServiceProvider () 
 		{
@@ -168,10 +164,8 @@ namespace System.Security.Cryptography {
 	
 		public byte[] Decrypt (byte[] rgb, bool fOAEP) 
 		{
-#if NET_1_1
 			if (m_disposed)
 				throw new ObjectDisposedException ("rsa");
-#endif
 			// choose between OAEP or PKCS#1 v.1.5 padding
 			AsymmetricKeyExchangeDeformatter def = null;
 			if (fOAEP)
@@ -252,10 +246,8 @@ namespace System.Security.Cryptography {
 		// HashAlgorithm descendant
 		public byte[] SignData (byte[] buffer, object halg) 
 		{
-#if NET_1_1
 			if (buffer == null)
 				throw new ArgumentNullException ("buffer");
-#endif
 			return SignData (buffer, 0, buffer.Length, halg);
 		}
 	
@@ -410,10 +402,8 @@ namespace System.Security.Cryptography {
 
 			var p = new CspParameters (PROV_RSA_FULL);
 			p.KeyNumber = keyBlob [5] == 0x24 ? AT_SIGNATURE : AT_KEYEXCHANGE;
-#if NET_1_1
 			if (useMachineKeyStore)
 				p.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
 			store = new KeyPairPersistence (p);
 		}
 	}
diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
index 629f5633c2e..3e1c714e375 100644
--- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
@@ -51,9 +51,7 @@ namespace System.Security.Permissions {
 		
 		// Properties
 		public string All {
-#if NET_1_1
 			get { throw new NotSupportedException ("All"); }
-#endif
 			set { 
 				read = value; 
 				write = value;
diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index 857197bda42..2ed62c05148 100644
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -682,10 +682,8 @@ namespace System.Threading {
 		}
 #endif
 
-#if NET_1_1
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static void MemoryBarrier ();
-#endif
 
 #if !MOONLIGHT
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -820,8 +818,6 @@ namespace System.Threading {
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		extern private static ThreadState GetState (InternalThread thread);
 
-#if NET_1_1
-		
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		extern public static byte VolatileRead (ref byte address);
 		
@@ -910,7 +906,6 @@ namespace System.Threading {
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		extern public static void VolatileWrite (ref UIntPtr address, UIntPtr value);
 		
-#endif
 
 		static int CheckStackSize (int maxStackSize)
 		{
@@ -1049,11 +1044,7 @@ namespace System.Threading {
 		[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
 		[StrongNameIdentityPermission (SecurityAction.LinkDemand, PublicKey="00000000000000000400000000000000")]
 		[Obsolete ("see CompressedStack class")]
-#if NET_1_1
 		public
-#else
-		internal
-#endif
 		CompressedStack GetCompressedStack ()
 		{
 			// Note: returns null if no CompressedStack has been set.
@@ -1069,11 +1060,7 @@ namespace System.Threading {
 		[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
 		[StrongNameIdentityPermission (SecurityAction.LinkDemand, PublicKey="00000000000000000400000000000000")]
 		[Obsolete ("see CompressedStack class")]
-#if NET_1_1
 		public
-#else
-		internal
-#endif
 		void SetCompressedStack (CompressedStack stack)
 		{
 			ExecutionContext.SecurityContext.CompressedStack = stack;
@@ -1081,7 +1068,6 @@ namespace System.Threading {
 
 #endif
 
-#if NET_1_1
 		void _Thread.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
 		{
 			throw new NotImplementedException ();
@@ -1102,6 +1088,5 @@ namespace System.Threading {
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 	}
 }
diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
index 9c570daab68..a160d80863b 100644
--- a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
@@ -186,11 +186,7 @@ namespace MonoTests.System.Collections
 			SortedList list = new SortedList (1000);
 			list.Capacity = new_capacity;
 
-#if NET_1_1
 			Assert.AreEqual (new_capacity, list.Capacity);
-#else
-			Assert.AreEqual (16, list.Capacity);
-#endif
 		}
 
 		[Test]
@@ -199,9 +195,6 @@ namespace MonoTests.System.Collections
 			SortedList list = new SortedList (42);
 			Assert.AreEqual (42, list.Capacity, "#1");
 			list.Capacity = 0;
-#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
-			Assert.AreEqual (16, list.Capacity, "#2");
-#endif
 		}
 
 		[Test]
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
index a2d68e2c186..6f681d67129 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
@@ -276,14 +276,12 @@ public class AssemblyBuilderTest
 		Assert.IsNull (ab.GetDynamicModule ("FOO4"));
 	}
 
-#if NET_1_1
 	[Test]
 	public void TestImageRuntimeVersion ()
 	{
 		string version = ab.ImageRuntimeVersion;
 		Assert.IsTrue (version.Length > 0);
 	}
-#endif
 
 	[Test]
 	public void TestAddResourceFile_Name_Null ()
diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyCas.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyCas.cs
index 57be788ba27..31114c46313 100644
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyCas.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyCas.cs
@@ -104,10 +104,6 @@ namespace MonoCasTests.System.Reflection {
 		public void PartialTrust_PermitOnly_ControlEvidenceFileIOPermission ()
 		{
 			at.Corlib_test ();
-#if NET_2_0
-#elif NET_1_1
-			at.Corlib ();
-#endif
 		}
 
 		[Test]
diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index b410b4f827b..f0df88a89d3 100644
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -192,7 +192,6 @@ namespace MonoTests.System.Reflection
 
 			// corlib doesn't reference anything
 			Assert.AreEqual (0, corlib.GetReferencedAssemblies ().Length, "GetReferencedAssemblies");
-#if NET_2_0
 			Assert.AreEqual ("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName");
 			// not really "true" but it's even more trusted so...
 			Assert.IsTrue (corlib.GlobalAssemblyCache, "GlobalAssemblyCache");
@@ -200,11 +199,6 @@ namespace MonoTests.System.Reflection
 			Assert.AreEqual ("v2.0.50727", corlib.ImageRuntimeVersion, "ImageRuntimeVersion");
 			Assert.IsFalse (corlib.ReflectionOnly, "ReflectionOnly");
 			Assert.AreEqual (0x1, corlib.ManifestModule.MetadataToken);
-#elif NET_1_1
-			Assert.IsFalse (corlib.GlobalAssemblyCache, "GlobalAssemblyCache");
-			Assert.AreEqual ("mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName");
-			Assert.AreEqual ("v1.1.4322", corlib.ImageRuntimeVersion, "ImageRuntimeVersion");
-#endif
 		}
 
 		[Test]
diff --git a/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeHelpersTest.cs b/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeHelpersTest.cs
index e7e91990b99..fc4010bd21c 100644
--- a/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeHelpersTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeHelpersTest.cs
@@ -153,7 +153,6 @@ namespace MonoTests.System.Runtime.CompilerServices {
 			RuntimeHelpers.InitializeArray (new Fielder ().array, rfh);
 		}
 
-#if NET_1_1
 		public void TestGetHashCode ()
 		{
 			Assert.AreEqual (0, RuntimeHelpers.GetHashCode (null));
@@ -182,6 +181,5 @@ namespace MonoTests.System.Runtime.CompilerServices {
 			Assert.IsTrue (RuntimeHelpers.Equals (o1, o3));
 			Assert.IsTrue (!RuntimeHelpers.Equals (o1, o4));
 		}
-#endif
 	}
 }
diff --git a/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingConfigurationTest.cs b/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingConfigurationTest.cs
index 8845862403b..ed92feba359 100644
--- a/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingConfigurationTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingConfigurationTest.cs
@@ -6,9 +6,7 @@
 // 
 
 using System;
-#if NET_1_1
-	using System.Net.Sockets;
-#endif
+using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
@@ -190,11 +188,7 @@ namespace MonoTests.System.Runtime.Remoting
 		
 		// tests the CAO related methods
 		[Test]
-#if NET_1_1
 		[ExpectedException(typeof(SocketException))]
-#else
-		[ExpectedException(typeof(RemotingException))]
-#endif
 		public void RegisterActivatedType()
 		{
 			TcpChannel chn = null;
diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
index a3bf9fd4c19..91b39eb832c 100644
--- a/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
@@ -1049,7 +1049,6 @@ public class RSACryptoServiceProviderTest {
 		Assert.IsTrue ((original != newKeyPair), "Key Pair Deleted");
 	}
 
-#if NET_1_1
 	[Test]
 	public void UseMachineKeyStore_Default ()
 	{
@@ -1086,7 +1085,6 @@ public class RSACryptoServiceProviderTest {
 		catch (UnauthorizedAccessException) {
 		}
 	}
-#endif
 
 	[Test]
 	public void PKCS1 () 
diff --git a/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
index 8ae3e4119a2..133501dd341 100644
--- a/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
@@ -101,7 +101,6 @@ namespace MonoTests.System.Security.Permissions {
 			Assert.AreEqual (envar, p.GetPathList (EnvironmentPermissionAccess.Read), "All=EnvironmentPermission-Read");
 			Assert.AreEqual (envar, p.GetPathList (EnvironmentPermissionAccess.Write), "All=EnvironmentPermission-Write");
 		}
-#if NET_1_1
 		[Test]
 		[ExpectedException (typeof (NotSupportedException))]
 		public void All_Get () 
@@ -109,7 +108,7 @@ namespace MonoTests.System.Security.Permissions {
 			EnvironmentPermissionAttribute attr = new EnvironmentPermissionAttribute (SecurityAction.Assert);
 			string s = attr.All;
 		}
-#endif
+
 		[Test]
 		public void Read () 
 		{
diff --git a/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
index 8b54433ea0b..ba7470e5cd6 100644
--- a/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
@@ -118,7 +118,7 @@ namespace MonoTests.System.Security.Permissions {
 			Assert.AreEqual (filename, p.GetPathList (FileIOPermissionAccess.Read) [0], "All=FileIOPermissionAttribute-Read");
 			Assert.AreEqual (filename, p.GetPathList (FileIOPermissionAccess.Write) [0], "All=FileIOPermissionAttribute-Write");
 		}
-#if NET_1_1
+
 		[Test]
 		[ExpectedException (typeof (NotSupportedException))]
 		public void All_Get () 
@@ -126,7 +126,7 @@ namespace MonoTests.System.Security.Permissions {
 			FileIOPermissionAttribute attr = new FileIOPermissionAttribute (SecurityAction.Assert);
 			string s = attr.All;
 		}
-#endif
+
 		[Test]
 		public void Append ()
 		{
diff --git a/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionTest.cs
index e8c51a54373..7a4e5644f99 100644
--- a/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionTest.cs
@@ -42,9 +42,7 @@ namespace MonoTests.System.Security.Permissions {
 		static SecurityPermissionFlag [] AllFlags = {
 			SecurityPermissionFlag.AllFlags,
 			SecurityPermissionFlag.Assertion,
-#if NET_1_1
 			SecurityPermissionFlag.BindingRedirects,
-#endif
 			SecurityPermissionFlag.ControlAppDomain,
 			SecurityPermissionFlag.ControlDomainPolicy,
 			SecurityPermissionFlag.ControlEvidence,
@@ -62,9 +60,7 @@ namespace MonoTests.System.Security.Permissions {
 		static SecurityPermissionFlag [] AllFlagsExceptNoFlags = {
 			SecurityPermissionFlag.AllFlags,
 			SecurityPermissionFlag.Assertion,
-#if NET_1_1
 			SecurityPermissionFlag.BindingRedirects,
-#endif
 			SecurityPermissionFlag.ControlAppDomain,
 			SecurityPermissionFlag.ControlDomainPolicy,
 			SecurityPermissionFlag.ControlEvidence,
@@ -80,9 +76,7 @@ namespace MonoTests.System.Security.Permissions {
 
 		static SecurityPermissionFlag [] AllFlagsExceptAllFlags = {
 			SecurityPermissionFlag.Assertion,
-#if NET_1_1
 			SecurityPermissionFlag.BindingRedirects,
-#endif
 			SecurityPermissionFlag.ControlAppDomain,
 			SecurityPermissionFlag.ControlDomainPolicy,
 			SecurityPermissionFlag.ControlEvidence,
diff --git a/mcs/class/corlib/Test/System.Security.Permissions/StrongNamePublicKeyBlobTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
index 3e07132ba76..22b8355d1f1 100644
--- a/mcs/class/corlib/Test/System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
@@ -71,18 +71,20 @@ public class StrongNamePublicKeyBlobTest {
 
 		// non standard get hash code - why ???
 		Assert.AreEqual (snpkb2.GetHashCode (), snpkb.GetHashCode (), "GetHashCode-0");
-#if NET_2_0
+
 		// the first 4 bytes has code has been fixed in 2.0 beta 1
-#elif NET_1_1
-		// It seems to be the first four bytes of the public key data
-		// which seems like non sense as all valid public key will have the same header ?
-		Assert.AreEqual (2359296, snpkb.GetHashCode (), "GetHashCode-1");
-		Assert.AreEqual (2359296, snpkb2.GetHashCode (), "GetHashCode-2");
-		Assert.AreEqual (2989, snpkb3.GetHashCode (), "GetHashCode-3");
-		byte[] header = { 0x00, 0x24, 0x00, 0x00 };
-		StrongNamePublicKeyBlob snpkb4 = new StrongNamePublicKeyBlob (header);
-		Assert.AreEqual (2359296, snpkb4.GetHashCode (), "GetHashCode-4");
-#endif
+
+// Historical data:
+// #elif NET_1_1
+// 		// It seems to be the first four bytes of the public key data
+// 		// which seems like non sense as all valid public key will have the same header ?
+// 		Assert.AreEqual (2359296, snpkb.GetHashCode (), "GetHashCode-1");
+// 		Assert.AreEqual (2359296, snpkb2.GetHashCode (), "GetHashCode-2");
+// 		Assert.AreEqual (2989, snpkb3.GetHashCode (), "GetHashCode-3");
+// 		byte[] header = { 0x00, 0x24, 0x00, 0x00 };
+// 		StrongNamePublicKeyBlob snpkb4 = new StrongNamePublicKeyBlob (header);
+// 		Assert.AreEqual (2359296, snpkb4.GetHashCode (), "GetHashCode-4");
+// #endif
 	}
 }
 
diff --git a/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs b/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
index 69ad39fd694..4c84824c912 100644
--- a/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
@@ -180,10 +180,8 @@ namespace MonoTests.System.Security.Principal {
 
 			IDeserializationCallback dc = (id as IDeserializationCallback);
 			Assert.IsNotNull (dc, "IDeserializationCallback");
-#if NET_1_1
 			ISerializable s = (id as ISerializable);
 			Assert.IsNotNull (s, "ISerializable");
-#endif
 		}
 
 		// This is clearly a hack - but I've seen it too many times so I think we