diff --git a/ninaAPI/AdvancedAPI.cs b/ninaAPI/AdvancedAPI.cs
index 64c7ce1..32ba347 100644
--- a/ninaAPI/AdvancedAPI.cs
+++ b/ninaAPI/AdvancedAPI.cs
@@ -112,6 +112,7 @@ public AdvancedAPI(ICameraMediator camera,
                 {
                     SetHostNames();
                     Server = new API();
+                    Server.Start();
                 }
             });
         }
diff --git a/ninaAPI/Options.xaml b/ninaAPI/Options.xaml
index 54d5ca3..9dafb82 100644
--- a/ninaAPI/Options.xaml
+++ b/ninaAPI/Options.xaml
@@ -95,74 +95,6 @@
                 </StackPanel>
             </StackPanel>
 
-            <Separator
-                Width="20"
-                Height="10"
-                Background="Transparent" />
-
-            <TextBlock
-                Margin="0,20,0,15"
-                FontSize="22"
-                FontWeight="Bold"
-                Text="Security" />
-
-            <StackPanel Orientation="Horizontal">
-                <TextBlock
-                    Width="200"
-                    Margin="0,5,5,5"
-                    Text="Use Security" />
-                <CheckBox Margin="5,0,0,0" IsChecked="{Binding Secure}" />
-            </StackPanel>
-
-            <StackPanel
-                Margin="0,5,0,0"
-                Orientation="Horizontal"
-                Visibility="{Binding SecureVisibility}">
-                <TextBlock
-                    Width="200"
-                    Margin="0,5,5,5"
-                    Text="Path to trusted SSL certificate" />
-                <TextBox
-                    Width="350"
-                    Margin="5"
-                    Text="{Binding CertificatePath}" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Visibility="{Binding SecureVisibility}">
-                <TextBlock
-                    Width="200"
-                    Margin="0,5,5,5"
-                    Text="Certificate Password" />
-                <TextBox
-                    Width="100"
-                    Margin="5"
-                    Text="{Binding CertificatePassword}" />
-            </StackPanel>
-
-            <StackPanel
-                Margin="0,5,0,0"
-                Orientation="Horizontal"
-                Visibility="{Binding SecureVisibility}">
-                <TextBlock
-                    Width="200"
-                    Margin="0,5,5,5"
-                    Text="Api Key" />
-                <TextBox
-                    Width="150"
-                    Margin="5"
-                    Text="{Binding ApiKey}" />
-                <Button
-                    Width="180"
-                    Margin="5"
-                    Command="{Binding GenerateApiKeyCommand}"
-                    Content="Generate new Api Key"
-                    ToolTip="Generates a 12-digit secure key" />
-                <Button
-                    Width="180"
-                    Margin="5"
-                    Command="{Binding SetApiKeyCommand}"
-                    Content="Set Api Key"
-                    ToolTip="This button sets the entered key as the API key. Remember this key, the plugin doesn't store it! If you forget the key, you can just create a new one" />
-            </StackPanel>
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ninaAPI/Properties/AssemblyInfo.cs b/ninaAPI/Properties/AssemblyInfo.cs
index 99f7460..c5d1198 100644
--- a/ninaAPI/Properties/AssemblyInfo.cs
+++ b/ninaAPI/Properties/AssemblyInfo.cs
@@ -6,8 +6,8 @@
 
 // [MANDATORY] The assembly versioning
 //Should be incremented for each new release build of a plugin
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.1")]
+[assembly: AssemblyFileVersion("2.0.0.1")]
 
 // [MANDATORY] The name of your plugin
 [assembly: AssemblyTitle("Advanced API")]
diff --git a/ninaAPI/WebService/V1/WebSocket.cs b/ninaAPI/WebService/V1/WebSocket.cs
index 3124e3b..c275ff8 100644
--- a/ninaAPI/WebService/V1/WebSocket.cs
+++ b/ninaAPI/WebService/V1/WebSocket.cs
@@ -63,14 +63,12 @@ public WebSocket(string urlPath) : base(urlPath, true)
         public static List<HttpResponse> Images = new List<HttpResponse>();
         public static List<HttpResponse> Events = new List<HttpResponse>();
 
-        private async void ImageSaved(object sender, ImageSavedEventArgs e)
+        private void ImageSaved(object sender, ImageSavedEventArgs e)
         {
             if (!e.MetaData.Image.ImageType.Equals("LIGHT"))
                 return;
 
             HttpResponse response = new HttpResponse() { Type = HttpResponse.TypeSocket };
-            e.Image = null;
-            e.Statistics.Histogram.Clear();
 
             response.Response = new Dictionary<string, object>()
             {
@@ -95,7 +93,7 @@ private async void ImageSaved(object sender, ImageSavedEventArgs e)
 
             Images.Add(response);
 
-            await Send(response);
+            Send(response);
         }
 
         private async void LogProcessor_NINALogEventSaved(object sender, NINALogEvent e)
diff --git a/ninaAPI/WebService/V2/WebSocketV2.cs b/ninaAPI/WebService/V2/WebSocketV2.cs
index 8a08d1b..2f2f9e8 100644
--- a/ninaAPI/WebService/V2/WebSocketV2.cs
+++ b/ninaAPI/WebService/V2/WebSocketV2.cs
@@ -66,7 +66,7 @@ public WebSocketV2(string urlPath) : base(urlPath, true)
         public static List<HttpResponse> Images = new List<HttpResponse>();
         public static List<HttpResponse> Events = new List<HttpResponse>();
 
-        private async void ImageSaved(object sender, ImageSavedEventArgs e) 
+        private void ImageSaved(object sender, ImageSavedEventArgs e) 
         {
             if (!e.MetaData.Image.ImageType.Equals("LIGHT"))
                 return;
@@ -102,7 +102,7 @@ private async void ImageSaved(object sender, ImageSavedEventArgs e)
             Images.Add(response);
             Events.Add(imageEvent);
 
-            await Send(response);
+            Send(response);
         }
 
         private async void LogProcessor_NINALogEventSaved(object sender, NINALogEvent e)