diff --git a/csharp/App/Backend/Database/Create.cs b/csharp/App/Backend/Database/Create.cs
index 6a41c8701..b84dabcea 100644
--- a/csharp/App/Backend/Database/Create.cs
+++ b/csharp/App/Backend/Database/Create.cs
@@ -152,7 +152,7 @@ public static partial class Db
     
     public static void AddCsvTimestamp(CsvTimestamp newCsvTimestamp,int installationId)
     {
-        var maxCSvPerInstallation = 2 * 60 * 24;
+        var maxCSvPerInstallation = 60 * 24;
         //Find the total number of warnings for this installation
         var totalCsvNames = CsvTimestamps.Count(csvTimestamp => csvTimestamp.InstallationId == installationId);
 
@@ -172,7 +172,7 @@ public static partial class Db
         }
         else
         {
-            Console.WriteLine("---------------Added the new Csv Timestamp to the database-----------------");
+            //Console.WriteLine("---------------Added the new Csv Timestamp to the database-----------------");
             Create(newCsvTimestamp);
         }
     }
diff --git a/csharp/App/Backend/Websockets/RabbitMQManager.cs b/csharp/App/Backend/Websockets/RabbitMQManager.cs
index 3abd0f1c5..32296a7b0 100644
--- a/csharp/App/Backend/Websockets/RabbitMQManager.cs
+++ b/csharp/App/Backend/Websockets/RabbitMQManager.cs
@@ -61,7 +61,7 @@ public static class RabbitMqManager
                 {
                     Installation installation = Db.Installations.FirstOrDefault(f => f.Product == receivedStatusMessage.Product && f.S3BucketId == receivedStatusMessage.InstallationId);
                     int installationId = (int )installation.Id;
-                    Console.WriteLine("Received a message from installation: " + installationId + " , product is: "+receivedStatusMessage.Product+ " and status is: " + receivedStatusMessage.Status);
+                    //Console.WriteLine("Received a message from installation: " + installationId + " , product is: "+receivedStatusMessage.Product+ " and status is: " + receivedStatusMessage.Status);
 
                     //This is a heartbit message, just update the timestamp for this installation.
                     //There is no need to notify the corresponding front-ends.
diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs
index 84ad79e47..f52484d3d 100644
--- a/csharp/App/SaliMax/src/Program.cs
+++ b/csharp/App/SaliMax/src/Program.cs
@@ -1,4 +1,4 @@
-#define Amax
+#undef Amax
 #undef GridLimit
 
 using System.Diagnostics;
@@ -728,7 +728,7 @@ internal static class Program
                 Console.WriteLine("ERROR: PUT");
                 var error = await response.GetStringAsync();
                 Console.WriteLine(error);
-                Heartbit(0);
+                Heartbit(new DateTime(0));
                 return false;
             }   
             
@@ -745,6 +745,7 @@ internal static class Program
     {
         var s3Bucket = Config.Load().S3?.Bucket;
         int.TryParse(s3Bucket?.Split("-")[0], out var installationId);
+        
         int.TryParse(timeStamp.ToUnixTime().ToString(), out var nameOfCsvFile);
             
         var returnedStatus = new StatusMessage
diff --git a/typescript/frontend-marios2/src/content/dashboards/BatteryView/MainStats.tsx b/typescript/frontend-marios2/src/content/dashboards/BatteryView/MainStats.tsx
index d9e0228e8..61501002e 100644
--- a/typescript/frontend-marios2/src/content/dashboards/BatteryView/MainStats.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/BatteryView/MainStats.tsx
@@ -418,20 +418,20 @@ function MainStats(props: MainStatsProps) {
               <ArrowBackIcon />
             </IconButton>
 
-            <Button
-              variant="contained"
-              onClick={handleSetDate}
-              disabled={loading}
-              sx={{
-                marginTop: '20px',
-                marginLeft: '20px',
-                backgroundColor: dateOpen ? '#808080' : '#ffc04d',
-                color: '#000000',
-                '&:hover': { bgcolor: '#f7b34d' }
-              }}
-            >
-              <FormattedMessage id="set_date" defaultMessage="Set Date" />
-            </Button>
+            {/*<Button*/}
+            {/*  variant="contained"*/}
+            {/*  onClick={handleSetDate}*/}
+            {/*  disabled={loading}*/}
+            {/*  sx={{*/}
+            {/*    marginTop: '20px',*/}
+            {/*    marginLeft: '20px',*/}
+            {/*    backgroundColor: dateOpen ? '#808080' : '#ffc04d',*/}
+            {/*    color: '#000000',*/}
+            {/*    '&:hover': { bgcolor: '#f7b34d' }*/}
+            {/*  }}*/}
+            {/*>*/}
+            {/*  <FormattedMessage id="set_date" defaultMessage="Set Date" />*/}
+            {/*</Button>*/}
           </Grid>
           <Grid
             container
diff --git a/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx b/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
index 1433f8e49..762a608e5 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
@@ -482,20 +482,20 @@ function Overview(props: OverviewProps) {
               <FormattedMessage id="lastweek" defaultMessage="Last week" />
             </Button>
 
-            <Button
-              variant="contained"
-              onClick={handleSetDate}
-              disabled={loading}
-              sx={{
-                marginTop: '20px',
-                marginLeft: '10px',
-                backgroundColor: dateOpen ? '#808080' : '#ffc04d',
-                color: '#000000',
-                '&:hover': { bgcolor: '#f7b34d' }
-              }}
-            >
-              <FormattedMessage id="lastmonth" defaultMessage="Set Date" />
-            </Button>
+            {/*<Button*/}
+            {/*  variant="contained"*/}
+            {/*  onClick={handleSetDate}*/}
+            {/*  disabled={loading}*/}
+            {/*  sx={{*/}
+            {/*    marginTop: '20px',*/}
+            {/*    marginLeft: '10px',*/}
+            {/*    backgroundColor: dateOpen ? '#808080' : '#ffc04d',*/}
+            {/*    color: '#000000',*/}
+            {/*    '&:hover': { bgcolor: '#f7b34d' }*/}
+            {/*  }}*/}
+            {/*>*/}
+            {/*  <FormattedMessage id="lastmonth" defaultMessage="Set Date" />*/}
+            {/*</Button>*/}
           </Grid>
 
           <Grid
diff --git a/typescript/frontend-marios2/src/content/dashboards/Overview/salidomoOverview.tsx b/typescript/frontend-marios2/src/content/dashboards/Overview/salidomoOverview.tsx
index 383a9ca5c..265d80d2f 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Overview/salidomoOverview.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Overview/salidomoOverview.tsx
@@ -319,22 +319,22 @@ function SalidomoOverview(props: salidomoOverviewProps) {
           </LocalizationProvider>
         )}
         <Grid container>
-          <Grid item xs={6} md={6}>
-            <Button
-              variant="contained"
-              onClick={handleSetDate}
-              disabled={loading}
-              sx={{
-                marginTop: '20px',
-                marginLeft: '10px',
-                backgroundColor: dateOpen ? '#808080' : '#ffc04d',
-                color: '#000000',
-                '&:hover': { bgcolor: '#f7b34d' }
-              }}
-            >
-              <FormattedMessage id="lastmonth" defaultMessage="Set Date" />
-            </Button>
-          </Grid>
+          {/*<Grid item xs={6} md={6}>*/}
+          {/*  <Button*/}
+          {/*    variant="contained"*/}
+          {/*    onClick={handleSetDate}*/}
+          {/*    disabled={loading}*/}
+          {/*    sx={{*/}
+          {/*      marginTop: '20px',*/}
+          {/*      marginLeft: '10px',*/}
+          {/*      backgroundColor: dateOpen ? '#808080' : '#ffc04d',*/}
+          {/*      color: '#000000',*/}
+          {/*      '&:hover': { bgcolor: '#f7b34d' }*/}
+          {/*    }}*/}
+          {/*  >*/}
+          {/*    <FormattedMessage id="lastmonth" defaultMessage="Set Date" />*/}
+          {/*  </Button>*/}
+          {/*</Grid>*/}
 
           <Grid
             container
diff --git a/typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/index.tsx b/typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/index.tsx
index a35b1a2c4..8b15fc5bd 100644
--- a/typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/index.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/index.tsx
@@ -92,10 +92,10 @@ function SalidomoInstallationTabs() {
               />
             )
           },
-          {
-            value: 'overview',
-            label: <FormattedMessage id="overview" defaultMessage="Overview" />
-          },
+          // {
+          //   value: 'overview',
+          //   label: <FormattedMessage id="overview" defaultMessage="Overview" />
+          // },
           {
             value: 'log',
             label: <FormattedMessage id="log" defaultMessage="Log" />