diff --git a/AusRegCliever/include/ausRegTK.h b/AusRegCliever/include/ausRegTK.h
index f88aca0..d7ba54c 100644
--- a/AusRegCliever/include/ausRegTK.h
+++ b/AusRegCliever/include/ausRegTK.h
@@ -8,7 +8,7 @@ class ausRegEPPTK {
   public: int tkScenario;
    // See the Toolkit Overview. At this level supposedly it can do everything.
 
-   ausRegEPPTK() { tkScenario = 0; }
+   ausRegEPPTK() { tkScenario = 1; }
    bool didInit(const std::string propertiesFilePath);
 
 
diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp
index 3e8f9fe..8ed6354 100644
--- a/AusRegCliever/server/mdAusReg.cpp
+++ b/AusRegCliever/server/mdAusReg.cpp
@@ -6,30 +6,13 @@ bool ausRegEPPTK::didInit(const std::string propPath) {
 
 	bool did=false;
 
-getPeerService:
-
-	switch(tkScenario) {
-	case 0:
-		try {
-		init( propPath );
-		did = true;
-	    }
-	    catch(std::exception &e) {
-	        theseLogs->logN(1,"Scenario Zero TK Exception: %s .",e.what());
-	    }
-        if (!did) { if (tkScenario++ <= MAX_SCENARIO) goto getPeerService; }
-        break;
-	case 1: // Our first level of implementation, allow an insecure partially authenticated TLS Session.
 		try {
 		scenario( tkScenario );
 		did = true;
 	    }
 	    catch(std::exception &e) {
-	        theseLogs->logN(1,"Scenario One TK Exception: %s .",e.what());
+	        theseLogs->logN(2,"Scenario %d TK Exception: %s .",tkScenario,e.what());
 	    }
-        if (!did) { if (tkScenario++ <= MAX_SCENARIO) goto getPeerService; }
-        break;
-        }
-	return did;
+       	return did;
 
 }