1 files changed, 2 insertions, 25 deletions
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentRemovalViewVM.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentRemovalViewVM.cs
index e8d966158..0917b012d 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentRemovalViewVM.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentRemovalViewVM.cs
@@ -39,23 +39,6 @@ namespace Tango.AzureUtils.UI.ViewModels
             set { _slotName = value; RaisePropertyChangedAuto(); }
         }
 
-        private String _email;
-        [Required(ErrorMessage = "Active directory email is required.")]
-        [EmailAddress(ErrorMessage = "Please enter a valid email.")]
-        public String Email
-        {
-            get { return _email; }
-            set { _email = value; RaisePropertyChangedAuto(); }
-        }
-
-        private String _password;
-        [Required(ErrorMessage = "Password is required.")]
-        public String Password
-        {
-            get { return _password; }
-            set { _password = value; RaisePropertyChangedAuto(); }
-        }
-
         private RemoveEnvironmentConfiguration _config;
         public RemoveEnvironmentConfiguration Config
         {
@@ -71,12 +54,6 @@ namespace Tango.AzureUtils.UI.ViewModels
             Config = new RemoveEnvironmentConfiguration();
         }
 
-        public override void OnApplicationReady()
-        {
-            Email = "roy@twine-s.com";
-            Password = "1Creativity";
-        }
-
         public override void OnAuthenticated(IAzure azure, List<IWebAppBase> apps)
         {
             _machineServiceApp = apps.SingleOrDefault(x => x.Name == "MachineService");
@@ -96,8 +73,8 @@ namespace Tango.AzureUtils.UI.ViewModels
 
                 IsFree = false;
 
-                Config.Email = Email;
-                Config.Password = Password;
+                Config.Email = Settings.Email;
+                Config.Password = Settings.Password;
 
                 await _environmentManager.RemoveEnvironment(SelectedDeploymentSlot, SlotName, Config);