diff --git a/ProjectPlugins/CodexPlugin/CodexAccess.cs b/ProjectPlugins/CodexPlugin/CodexAccess.cs
index e56bc1e..537dee0 100644
--- a/ProjectPlugins/CodexPlugin/CodexAccess.cs
+++ b/ProjectPlugins/CodexPlugin/CodexAccess.cs
@@ -62,18 +62,22 @@ namespace CodexPlugin
 
         public string UploadFile(FileStream fileStream)
         {
-            CheckSpaceIsAvailable(fileStream);
+            LogSpaceStatistics("Before upload");
 
-            return OnCodex(
+            var str = OnCodex(
                 api => api.UploadAsync(fileStream),
-                CreateRetryConfig(nameof(UploadFile), f => CheckSpaceIsAvailable(fileStream)));
+                CreateRetryConfig(nameof(UploadFile)));
+
+            LogSpaceStatistics("After upload");
+
+            return str;
         }
 
         public Stream DownloadFile(string contentId)
         {
             var fileResponse = OnCodex(
                 api => api.DownloadNetworkAsync(contentId),
-                CreateRetryConfig(nameof(DownloadFile), f => { }));
+                CreateRetryConfig(nameof(DownloadFile)));
 
             if (fileResponse.StatusCode != 200) throw new Exception("Download failed with StatusCode: " + fileResponse.StatusCode);
             return fileResponse.Stream;
@@ -160,18 +164,6 @@ namespace CodexPlugin
             return Container.Containers.Single().GetAddress(tools.GetLog(), CodexContainerRecipe.ApiPortTag);
         }
 
-        private void CheckSpaceIsAvailable(FileStream fileStream)
-        {
-            var space = Space();
-
-            if (space.FreeBytes < fileStream.Length)
-            {
-                var msg = $"Not enough space available. File: {fileStream.Length} Free: {space.FreeBytes}";
-                tools.GetLog().Error(msg);
-                throw new Exception(msg);
-            }
-        }
-
         private void CheckContainerCrashed(HttpClient client)
         {
             if (hasContainerCrashed) throw new Exception($"Container {GetName()} has crashed.");
@@ -196,14 +188,13 @@ namespace CodexPlugin
             hasContainerCrashed = true;
         }
 
-        private Retry CreateRetryConfig(string description, Action<Failure> onFailure)
+        private Retry CreateRetryConfig(string description)
         {
             var timeSet = tools.TimeSet;
             var log = tools.GetLog();
 
             return new Retry(description, timeSet.HttpRetryTimeout(), timeSet.HttpCallRetryDelay(), failure =>
             {
-                onFailure(failure);
                 if (failure.Duration.TotalSeconds < timeSet.HttpCallTimeout().TotalSeconds)
                 {
                     Investigate(log, failure, timeSet);
@@ -242,15 +233,7 @@ namespace CodexPlugin
         {
             try
             {
-                var space = Space();
-                log.Log($"Got space statistics: {space}");
-                log.Log($"Free space: {space.FreeBytes}");
-
-                if (space.FreeBytes < 1.MB().SizeInBytes)
-                {
-                    log.Log("There's less than 1MB free. Stopping...");
-                    Throw(failure);
-                }
+                LogSpaceStatistics();
             }
             catch (Exception e)
             {
@@ -260,6 +243,11 @@ namespace CodexPlugin
             }
         }
 
+        private void LogSpaceStatistics(string prefix = "")
+        {
+            tools.GetLog().Log($"{prefix} Space statistics: {Space()}");
+        }
+
         private void Throw(Failure failure)
         {
             throw failure.Exception;