diff --git a/product/roundhouse.console/Program.cs b/product/roundhouse.console/Program.cs
index fa3d4b64..966dfd23 100644
--- a/product/roundhouse.console/Program.cs
+++ b/product/roundhouse.console/Program.cs
@@ -615,7 +615,6 @@ private static RoundhouseMigrationRunner get_migration_runner(ConfigurationPrope
                 configuration.Drop,
                 configuration.DoNotCreateDatabase,
                 configuration.WithTransaction,
-                configuration.RecoveryModeSimple,
                 configuration);
         }
 
diff --git a/product/roundhouse.databases.sqlserver/SqlServerDatabase.cs b/product/roundhouse.databases.sqlserver/SqlServerDatabase.cs
index 2cc78dd1..980d495f 100644
--- a/product/roundhouse.databases.sqlserver/SqlServerDatabase.cs
+++ b/product/roundhouse.databases.sqlserver/SqlServerDatabase.cs
@@ -111,6 +111,7 @@ public void create_roundhouse_schema_if_it_doesnt_exist()
             {
                 run_sql(create_roundhouse_schema_script(),ConnectionType.Default);
             }
+#pragma warning disable 168
             catch (Exception ex)
             {
                 throw;
@@ -118,6 +119,7 @@ public void create_roundhouse_schema_if_it_doesnt_exist()
                 //    "Either the schema has already been created OR {0} with provider {1} does not provide a facility for creating roundhouse schema at this time.{2}{3}",
                 //    GetType(), provider, Environment.NewLine, ex.Message);
             }
+#pragma warning restore 168
         }
 
         public string create_roundhouse_schema_script()
diff --git a/product/roundhouse.tasks/Roundhouse.cs b/product/roundhouse.tasks/Roundhouse.cs
index 30a6c136..5680c1e2 100644
--- a/product/roundhouse.tasks/Roundhouse.cs
+++ b/product/roundhouse.tasks/Roundhouse.cs
@@ -229,7 +229,6 @@ public void run_the_task()
                 Drop,
                 DoNotCreateDatabase,
                 WithTransaction,
-                RecoveryModeSimple,
                 this);
 
             roundhouse_runner.run();
diff --git a/product/roundhouse.tests.integration/infrastructure/persistence/NHibernateSessionFactorySpecs.cs b/product/roundhouse.tests.integration/infrastructure/persistence/NHibernateSessionFactorySpecs.cs
index 05291e74..460cd786 100644
--- a/product/roundhouse.tests.integration/infrastructure/persistence/NHibernateSessionFactorySpecs.cs
+++ b/product/roundhouse.tests.integration/infrastructure/persistence/NHibernateSessionFactorySpecs.cs
@@ -39,7 +39,6 @@ public when_nhibernate_session_factory_is_created_for_sql_server()
             private static void get_schema_export(Configuration cfg)
             {
                 build_schema(cfg);
-                int i = 0;
             }
 
             [Observation]
diff --git a/product/roundhouse.tests/infrastructure.app/tokens/TokenReplacerSpecs.cs b/product/roundhouse.tests/infrastructure.app/tokens/TokenReplacerSpecs.cs
index 6bdc49eb..e83cf764 100644
--- a/product/roundhouse.tests/infrastructure.app/tokens/TokenReplacerSpecs.cs
+++ b/product/roundhouse.tests/infrastructure.app/tokens/TokenReplacerSpecs.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace roundhouse.tests.infrastructure.app.tokens
@@ -52,13 +53,13 @@ public void if_given_a_value_that_is_the_name_of_a_configuration_item_but_is_not
                 TokenReplacer.replace_tokens(configuration, "ALTER DATABASE DatabaseName").should_be_equal_to("ALTER DATABASE DatabaseName");
             }
 
-            [Observation]
+            [Observation, CLSCompliant(false)]
             public void if_given_bracket_bracket_databasename_bracket_bracket_should_replace_with_the_DatabaseName_from_the_configuration()
             {
                 TokenReplacer.replace_tokens(configuration, "ALTER DATABASE {{databasename}}").should_be_equal_to("ALTER DATABASE " + database_name);
             }
 
-            [Observation]
+            [Observation, CLSCompliant(false)]
             public void if_given_bracket_bracket_DATABASENAME_bracket_bracket_should_replace_with_the_DatabaseName_from_the_configuration()
             {
                 TokenReplacer.replace_tokens(configuration, "ALTER DATABASE {{DATABASENAME}}").should_be_equal_to("ALTER DATABASE " + database_name);
diff --git a/product/roundhouse.tests/runners/RoundhouseMigratorRunnerSpecs.cs b/product/roundhouse.tests/runners/RoundhouseMigratorRunnerSpecs.cs
index a3468b29..1be0dc90 100644
--- a/product/roundhouse.tests/runners/RoundhouseMigratorRunnerSpecs.cs
+++ b/product/roundhouse.tests/runners/RoundhouseMigratorRunnerSpecs.cs
@@ -28,7 +28,7 @@ protected concern_for_migrator_runner()
             {
                 configuration = new DefaultConfiguration
                 {
-                    EnvironmentName = "TEST",
+                    EnvironmentNames = "TEST",
                     Drop = false ,
                     Silent = true
                 };
@@ -56,7 +56,6 @@ protected concern_for_migrator_runner()
                             configuration.Drop,
                             configuration.DoNotCreateDatabase,
                             configuration.WithTransaction,
-                            configuration.RecoveryModeSimple,
                             configuration);
 
                 var container_mock = new Mock<InversionContainer>();
diff --git a/product/roundhouse/Migrate.cs b/product/roundhouse/Migrate.cs
index 7544d163..acc907f4 100644
--- a/product/roundhouse/Migrate.cs
+++ b/product/roundhouse/Migrate.cs
@@ -116,7 +116,6 @@ private RoundhouseMigrationRunner GetMigrationRunner()
                 this.configuration.Drop,
                 this.configuration.DoNotCreateDatabase,
                 this.configuration.WithTransaction,
-                this.configuration.RecoveryModeSimple,
                 this.configuration);
         }
 
diff --git a/product/roundhouse/runners/RoundhouseMigrationRunner.cs b/product/roundhouse/runners/RoundhouseMigrationRunner.cs
index ae8bef58..2393a466 100644
--- a/product/roundhouse/runners/RoundhouseMigrationRunner.cs
+++ b/product/roundhouse/runners/RoundhouseMigrationRunner.cs
@@ -25,7 +25,6 @@ public sealed class RoundhouseMigrationRunner : IRunner
         public bool dropping_the_database { get; set; }
         private readonly bool dont_create_the_database;
         private bool run_in_a_transaction;
-        private readonly bool use_simple_recovery;
         private readonly ConfigurationPropertyHolder configuration;
         private const string SQL_EXTENSION = "*.sql";
 
@@ -40,7 +39,6 @@ public sealed class RoundhouseMigrationRunner : IRunner
             bool dropping_the_database,
             bool dont_create_the_database,
             bool run_in_a_transaction,
-            bool use_simple_recovery,
             ConfigurationPropertyHolder configuration)
         {
             this.known_folders = known_folders;
@@ -53,7 +51,6 @@ public sealed class RoundhouseMigrationRunner : IRunner
             this.dropping_the_database = dropping_the_database;
             this.dont_create_the_database = dont_create_the_database;
             this.run_in_a_transaction = run_in_a_transaction;
-            this.use_simple_recovery = use_simple_recovery;
             this.configuration = configuration;
         }