diff --git a/.idea/.idea.Aaru/.idea/vcs.xml b/.idea/.idea.Aaru/.idea/vcs.xml
index 2d75da1c5..53b6d8915 100644
--- a/.idea/.idea.Aaru/.idea/vcs.xml
+++ b/.idea/.idea.Aaru/.idea/vcs.xml
@@ -5,13 +5,6 @@
       <inspection_tool class="GraziCommit" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>
   </component>
-  <component name="GithubSharedProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="master" />
-      </list>
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/Aaru.Checksums" vcs="Git" />
diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
index c0861e68d..8914f9cdb 100644
--- a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
@@ -28,7 +28,6 @@
 using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
-using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
 namespace Aaru.Tests.Filesystems.CPM
@@ -53,16 +52,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 Sectors     = 360,
                 SectorSize  = 512,
                 Clusters    = 171,
-                ClusterSize = 1024,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo()
-                {
-                    Blocks = 172,
-                        FilenameLength = 11,
-                        Files = 38,
-                        FreeBlocks = 134,
-            PluginId = Plugin.Id,
-            Type = "CP/M filesystem"
-                }
+                ClusterSize = 1024
             },
             new FileSystemTest
             {
@@ -72,16 +62,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 Sectors     = 360,
                 SectorSize  = 512,
                 Clusters    = 171,
-                ClusterSize = 1024,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo()
-                {
-                    Blocks         = 172,
-                    FilenameLength = 11,
-                    Files          = 64,
-                    FreeBlocks     = 108,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }
+                ClusterSize = 1024
             },
             new FileSystemTest
             {
@@ -92,16 +73,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 Bootable    = true,
                 Clusters    = 171,
                 ClusterSize = 1024
-                ,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo()
-                {
-                    Blocks         = 172,
-                    FilenameLength = 11,
-                    Files          = 38,
-                    FreeBlocks     = 134,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }},
+            },
             new FileSystemTest
             {
                 TestFile    = "system_files.imd",
@@ -110,16 +82,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 512,
                 Bootable    = true,
                 Clusters    = 171,
-                ClusterSize = 1024,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo()
-                {
-                    Blocks         = 172,
-                    FilenameLength = 11,
-                    Files          = 64,
-                    FreeBlocks     = 108,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }
+                ClusterSize = 1024
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/CPM/KayproII.cs b/Aaru.Tests/Filesystems/CPM/KayproII.cs
index 37748078d..62ca7814d 100644
--- a/Aaru.Tests/Filesystems/CPM/KayproII.cs
+++ b/Aaru.Tests/Filesystems/CPM/KayproII.cs
@@ -28,7 +28,6 @@
 using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
-using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
 namespace Aaru.Tests.Filesystems.CPM
@@ -53,13 +52,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 512,
                 Bootable    = true,
                 Clusters    = 194,
-                ClusterSize = 1024,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo(){Blocks = 195,
-                    FilenameLength                                          = 11,
-                    Files                                                   = 38,
-                    FreeBlocks                                              = 157,
-            PluginId                                                        = Plugin.Id,
-            Type                                                            = "CP/M filesystem"}
+                ClusterSize = 1024
             },
             new FileSystemTest
             {
@@ -69,13 +62,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 512,
                 Bootable    = true,
                 Clusters    = 194,
-                ClusterSize = 1024,
-                Info = new Aaru.CommonTypes.Structs.FileSystemInfo(){Blocks = 195,
-                    FilenameLength                                          = 11,
-                    Files                                                   = 38,
-                    FreeBlocks                                              = 157,
-                    PluginId                                                = Plugin.Id,
-                    Type                                                    = "CP/M filesystem"}
+                ClusterSize = 1024
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
index f34470cb5..8be082427 100644
--- a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
@@ -53,15 +53,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 256,
                 Bootable    = true,
                 Clusters    = 316,
-                ClusterSize = 2048, Info =new Aaru.CommonTypes.Structs.FileSystemInfo
-                {
-                    Blocks = 317,
-                        FilenameLength = 11,
-                        Files = 38,
-                        FreeBlocks = 279,
-            PluginId = Plugin.Id,
-            Type = "CP/M filesystem"
-            }
+                ClusterSize = 2048
             },
             new FileSystemTest
             {
@@ -71,15 +63,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 256,
                 Bootable    = true,
                 Clusters    = 316,
-                ClusterSize = 2048, Info =new Aaru.CommonTypes.Structs.FileSystemInfo
-                {
-                    Blocks         = 317,
-                    FilenameLength = 11,
-                    Files          = 128,
-                    FreeBlocks     = 189,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }
+                ClusterSize = 2048
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
index 816506a0c..4d7a393ac 100644
--- a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
@@ -52,15 +52,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 512,
                 Bootable    = true,
                 Clusters    = 189,
-                ClusterSize = 1024, Info =new Aaru.CommonTypes.Structs.FileSystemInfo
-                {
-                    Blocks         = 190,
-                    FilenameLength = 11,
-                    Files          = 38,
-                    FreeBlocks     = 152,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }
+                ClusterSize = 1024
             },
             new FileSystemTest
             {
@@ -70,15 +62,7 @@ namespace Aaru.Tests.Filesystems.CPM
                 SectorSize  = 512,
                 Bootable    = true,
                 Clusters    = 189,
-                ClusterSize = 1024, Info =new Aaru.CommonTypes.Structs.FileSystemInfo
-                {
-                    Blocks         = 190,
-                    FilenameLength = 11,
-                    Files          = 64,
-                    FreeBlocks     = 126,
-                    PluginId       = Plugin.Id,
-                    Type           = "CP/M filesystem"
-                }
+                ClusterSize = 1024
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox.cs b/Aaru.Tests/Filesystems/FATX/Xbox.cs
index 92e1a59a8..8e0d7554d 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox.cs
@@ -31,7 +31,6 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
-using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
 // ReSharper disable StringLiteralTypo
 
@@ -57,22 +56,7 @@ namespace Aaru.Tests.Filesystems.FATX
                 Clusters     = 1960,
                 ClusterSize  = 16384,
                 VolumeName   = "Volume láb€l",
-                VolumeSerial = "4639B7D0",
-                Info = new FileSystemInfo
-                {
-                    Blocks         = 1960,
-                    FilenameLength = 42,
-                    Files          = 0,
-                    FreeBlocks     = 0,
-                    FreeFiles      = 0,
-                    Type           = "Xbox FAT",
-                    Id =
-                    {
-                        IsInt    = true,
-                        Serial32 = 0x58544146
-                    },
-                    PluginId = Plugin.Id
-                }
+                VolumeSerial = "4639B7D0"
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox360.cs b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
index 1d66e2839..6b4a68a38 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox360.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
@@ -31,7 +31,6 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
-using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
 namespace Aaru.Tests.Filesystems.FATX
 {
@@ -56,22 +55,7 @@ namespace Aaru.Tests.Filesystems.FATX
                 Clusters     = 14848,
                 ClusterSize  = 16384,
                 VolumeName   = "",
-                VolumeSerial = "66C2E9D0",
-                Info = new FileSystemInfo
-                {
-                    Blocks         = 14848,
-                    FilenameLength = 42,
-                    Files          = 0,
-                    FreeBlocks     = 0,
-                    FreeFiles      = 0,
-                    Id =
-                    {
-                        IsInt    = true,
-                        Serial32 = 1481916742
-                    },
-                    PluginId = Plugin.Id,
-                    Type     = "Xbox 360 FAT"
-                }
+                VolumeSerial = "66C2E9D0"
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
index 1b18c0453..8d7f624b1 100644
--- a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
+++ b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
@@ -11,7 +11,6 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using NUnit.Framework;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
-using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
 namespace Aaru.Tests.Filesystems
 {
@@ -109,12 +108,6 @@ namespace Aaru.Tests.Filesystems
 
                     Assert.AreEqual(Errno.NoError, ret, $"Unmountable: {testFile}");
 
-                    ret = fs.StatFs(out FileSystemInfo stat);
-
-                    Assert.AreEqual(Errno.NoError, ret, $"Unexpected error retrieving filesystem stats for {testFile}");
-
-                    stat.Should().BeEquivalentTo(test.Info, $"Incorrect filesystem stats for {testFile}");
-
                     var serializer = new JsonSerializer
                     {
                         Formatting        = Formatting.Indented,
diff --git a/Aaru.Tests/Structs.cs b/Aaru.Tests/Structs.cs
index 1c8151e28..106832083 100644
--- a/Aaru.Tests/Structs.cs
+++ b/Aaru.Tests/Structs.cs
@@ -34,7 +34,6 @@ namespace Aaru.Tests
         public Dictionary<string, FileData> Contents;
         public string                       ContentsJson;
         public Encoding                     Encoding;
-        public FileSystemInfo               Info;
         public string                       Namespace;
         /// <summary>System or OEM ID</summary>
         public string SystemId;