diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index 7449e41..d51671e 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -243,46 +243,48 @@ namespace DevConsole
 
         private static void FlcRemoveFirstSaveEntryAction()
         {
-            Guid firstMasterGameRecordGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
+            Guid firstGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords).First().Id;
-            MasterGameRecordModel masterGameRecordToRemove = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
-                Firelance.Collections.GameRecords, firstMasterGameRecordGuid);
-            ObjectId firstSaveGameEntryObjId = masterGameRecordToRemove.SaveGameEntries.Select(x => x.SaveDataID).First();
-            masterGameRecordToRemove.SaveGameEntries.RemoveAll(x => x.SaveDataID == firstSaveGameEntryObjId);
+            MasterGameRecordModel recordToRemove = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
+                Firelance.Collections.GameRecords, firstGuid);
+            ObjectId firstSaveId = recordToRemove.SaveGameEntries.Select(x => x.SaveDataID).First();
+            recordToRemove.SaveGameEntries.RemoveAll(x => x.SaveDataID == firstSaveId);
 
             flcMgr.CRUD.UpsertRecordById(Firelance.Collections.GameRecords,
-                                        firstMasterGameRecordGuid,
-                                        masterGameRecordToRemove);
+                                        firstGuid,
+                                        recordToRemove);
 
-            var result = flcMgr.GFS.DeleteFile(firstSaveGameEntryObjId);
+            var result = flcMgr.GFS.DeleteFile(firstSaveId);
         }
 
         private static void FlcInsertBlankSaveEntryAction()
         {
-            Guid firstMasterGameRecordGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
+            Guid firstGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords).First().Id;
-            MasterGameRecordModel masterGameRecordToInsert = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
-                Firelance.Collections.GameRecords, firstMasterGameRecordGuid);
-            masterGameRecordToInsert.SaveGameEntries.Add(new SaveGameEntriesModel());
+            MasterGameRecordModel recordToInsert = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
+                Firelance.Collections.GameRecords, firstGuid);
+            recordToInsert.SaveGameEntries.Add(
+                new SaveGameEntriesModel());
 
-            flcMgr.CRUD.UpsertRecordById(Firelance.Collections.GameRecords,
-                                        firstMasterGameRecordGuid,
-                                        masterGameRecordToInsert);
+            flcMgr.CRUD.UpsertRecordById(   Firelance.Collections.GameRecords,
+                                            firstGuid,
+                                            recordToInsert);
         }
 
         private static void FlcUploadToGridFsAction()
         {
             var ulObjId = new ObjectId(flcMgr.GFS.UploadFile("TestFile", @"C:\Users\Dunestorm\Downloads\OpenMW-0.46.0-win64.exe").Result);
 
-            Guid firstMasterGameRecordGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
+            Guid firstGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords).First().Id;
-            var saveGameEntry = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
-                Firelance.Collections.GameRecords, firstMasterGameRecordGuid);
-            saveGameEntry.SaveGameEntries.Add(new SaveGameEntriesModel() { SaveDataID = ulObjId });
+            MasterGameRecordModel saveGameEntry = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
+                Firelance.Collections.GameRecords, firstGuid);
+            saveGameEntry.SaveGameEntries.Add(
+                new SaveGameEntriesModel() { SaveDataID = ulObjId });
 
-            flcMgr.CRUD.UpsertRecordById(Firelance.Collections.GameRecords,
-                            firstMasterGameRecordGuid,
-                            saveGameEntry);
+            flcMgr.CRUD.UpsertRecordById(   Firelance.Collections.GameRecords,
+                                            firstGuid,
+                                            saveGameEntry);
 
             Console.WriteLine(ulObjId);
         }
diff --git a/FireLance/Models/SaveDirectoryDescriptorModel.cs b/FireLance/Models/SaveDirectoryDescriptorModel.cs
deleted file mode 100644
index 4f2dc19..0000000
--- a/FireLance/Models/SaveDirectoryDescriptorModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Firelance.Models
-{
-    public class SaveDirectoryDescriptorModel
-    {
-        public string Element { get; set; }
-        public bool IsFile { get; set; }
-        public DateTime LastModifyDate { get; set; }
-    }
-}
-
diff --git a/FireLance/Models/SaveGameEntriesModel.cs b/FireLance/Models/SaveGameEntriesModel.cs
index a2d47d1..bfe96c8 100644
--- a/FireLance/Models/SaveGameEntriesModel.cs
+++ b/FireLance/Models/SaveGameEntriesModel.cs
@@ -7,7 +7,6 @@ namespace Firelance.Models
     {
         public ObjectId SaveDataID { get; set; }
         public string Description { get; set; }
-        public List<SaveDirectoryDescriptorModel> SaveDirectoryTree { get; set; }
     }
 }