1 files changed, 3 insertions, 13 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index a819a4d1a..d2838b758 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -130,11 +130,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         public ISuggestionProvider MachinesProvider { get; set; }
 
-        /// <summary>
-        /// Gets or sets the versions provider.
-        /// </summary>
-        public ISuggestionProvider VersionsProvider { get; set; }
-
         #endregion
 
         #region Commands
@@ -203,11 +198,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             {
                 return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
             });
-
-            VersionsProvider = new SuggestionProvider((filter) =>
-            {
-                return _db.MachineVersions.Where(x => x.Version.ToString().StartsWith(filter) || x.Name.StartsWith(filter)).ToList();
-            });
         }
 
         #endregion
@@ -283,7 +273,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         InitCollections().Wait();
                         Machine = _db.Machines.Where(x => x.Guid == SelectedMachine.Guid).Include(x => x.Organization).SingleOrDefault(x => x.Guid == SelectedMachine.Guid);
-                        Configuration = _db.LoadConfiguration(x => x.Guid == Machine.ConfigurationGuid);
+                        Configuration = _db.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
 
                         SetHistory();
 
@@ -312,7 +302,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         CanWork = false;
 
-                        SelectedHistoryConfiguration = _db.LoadConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
+                        SelectedHistoryConfiguration = _db.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
                         Configuration = SelectedHistoryConfiguration;
                         Machine.Configuration = Configuration;
 
@@ -700,7 +690,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     await Task.Factory.StartNew(() =>
                     {
                         var version = _db.MachineVersions.Where(x => x.Guid == Machine.MachineVersion.Guid).Include(x => x.DefaultConfiguration).FirstOrDefault();
-                        var version_config = _db.LoadConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
+                        var version_config = _db.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
                         Configuration = version_config.Clone();
                         Machine.Configuration = Configuration;
                     });