diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml
index 36027875..7ba80ce3 100644
--- a/ZitiTunneler/MainWindow.xaml
+++ b/ZitiTunneler/MainWindow.xaml
@@ -165,9 +165,5 @@
             </Grid>
             <Button Content="Button" HorizontalAlignment="Left" Height="100" Margin="13,194,0,0" VerticalAlignment="Top" Width="75"/>
         </Grid>
-        <Button Content="Rem Id" HorizontalAlignment="Left" Margin="265,255,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click_1"/>
-        <Button Content="Add Svc" HorizontalAlignment="Left" Margin="265,230,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click_2"/>
-        <Button Content="Rem Svc" HorizontalAlignment="Left" Margin="265,201,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click_3"/>
-        <Button Content="Add Id" HorizontalAlignment="Left" Margin="265,176,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click_4"/>
     </Grid>
 </Window>
diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs
index 5b5088ba..ffa2ef50 100644
--- a/ZitiTunneler/MainWindow.xaml.cs
+++ b/ZitiTunneler/MainWindow.xaml.cs
@@ -464,25 +464,5 @@ namespace ZitiTunneler {
 				e.Cancel = true;
 			}
 		}
-
-		private void Button_Click_1(object sender, RoutedEventArgs e)
-		{
-			serviceClient.debug();
-		}
-
-		private void Button_Click_2(object sender, RoutedEventArgs e)
-		{
-			serviceClient.debug();
-		}
-
-		private void Button_Click_3(object sender, RoutedEventArgs e)
-		{
-			serviceClient.debug();
-		}
-
-		private void Button_Click_4(object sender, RoutedEventArgs e)
-		{
-			serviceClient.debug();
-		}
 	}
 }