Index: branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs	(revision 11202)
+++ branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs	(revision 11203)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
Index: branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Properties/AssemblyInfo.cs.frame
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Properties/AssemblyInfo.cs.frame	(revision 11202)
+++ branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Properties/AssemblyInfo.cs.frame	(revision 11203)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32,5 +32,5 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55,3 +55,3 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Index: branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/SlaveCommListener.cs
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/SlaveCommListener.cs	(revision 11202)
+++ branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/SlaveCommListener.cs	(revision 11203)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
Index: branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config	(revision 11202)
+++ branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config	(revision 11203)
@@ -4,10 +4,9 @@
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
       <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <runtime>
     <gcServer enabled="true" />
-  </runtime>      
+  </runtime>
   
   <system.serviceModel>
@@ -67,7 +66,10 @@
    
  </system.serviceModel>
-
+  
   <userSettings>
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
+      <setting name="HeartbeatInterval" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
       <setting name="LastUsedFileName" serializeAs="String">
         <value>lastUsed.dat</value>
@@ -137,45 +139,10 @@
       </setting>
       <setting name="NrOfCoresToScavenge" serializeAs="String">
-        <value>-1</value>
+        <value>2</value>
       </setting>
       <setting name="ShutdownCommand" serializeAs="String">
         <value>shutdown.exe</value>
       </setting>
-      <setting name="HeartbeatInterval" serializeAs="String">
-        <value>00:00:40</value>
-      </setting>
-    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
-    <HeuristicLab.Clients.Hive.Settings>
-      <setting name="MaxParallelUploads" serializeAs="String">
-        <value>2</value>
-      </setting>
-      <setting name="HLBinaryName" serializeAs="String">
-        <value>HeuristicLab 3.3.exe</value>
-      </setting>
-      <setting name="ResultPollingInterval" serializeAs="String">
-        <value>00:00:20</value>
-      </setting>
-      <setting name="MaxParallelDownloads" serializeAs="String">
-        <value>2</value>
-      </setting>
-      <setting name="MaxRepeatServiceCalls" serializeAs="String">
-        <value>5</value>
-      </setting>
-      <setting name="AnonymousUserName" serializeAs="String">
-        <value>anonymous</value>
-      </setting>
-      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
-        <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <string>netTcpBinding_IHiveService</string>
-            <string>wsHttpBinding_IHiveService</string>
-          </ArrayOfString>
-        </value>
-      </setting>
-      <setting name="MaxEndpointRetries" serializeAs="String">
-        <value>3</value>
-      </setting>
-    </HeuristicLab.Clients.Hive.Settings>
+   </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
