diff --git a/elixirkit/demo/rel/dotnet/Demo.cs b/elixirkit/demo/rel/dotnet/Demo.cs
index c94000516..89682bc98 100644
--- a/elixirkit/demo/rel/dotnet/Demo.cs
+++ b/elixirkit/demo/rel/dotnet/Demo.cs
@@ -1,11 +1,9 @@
-using ElixirKit;
-
-class Demo {
+class Demo
+{
     public static void Main()
     {
-        var api = new ElixirKit.API();
-        api.Start(name: "demo");
-        api.Publish("log", "Hello from C#!");
-        api.WaitForExit();
+        ElixirKit.API.Start(name: "demo");
+        ElixirKit.API.Publish("log", "Hello from C#!");
+        ElixirKit.API.WaitForExit();
     }
 }
diff --git a/elixirkit/demo/rel/winforms/Demo.cs b/elixirkit/demo/rel/winforms/Demo.cs
index e703f6b90..565e3e693 100644
--- a/elixirkit/demo/rel/winforms/Demo.cs
+++ b/elixirkit/demo/rel/winforms/Demo.cs
@@ -5,39 +5,34 @@ static class DemoMain
     [STAThread]
     static void Main()
     {
-        var api = new ElixirKit.API(id: "com.example.Demo");
-
-        if (api.MainInstance)
+        if (ElixirKit.API.IsMainInstance("com.example.Demo"))
         {
-            api.Start(name: "demo", exited: (exitCode) =>
+            ElixirKit.API.Start(name: "demo", exited: (exitCode) =>
             {
                 Application.Exit();
             });
 
             Application.ApplicationExit += (sender, args) =>
             {
-                api.Stop();
+                ElixirKit.API.Stop();
             };
 
-            api.Publish("log", "Hello from Windows Forms!");
+            ElixirKit.API.Publish("log", "Hello from Windows Forms!");
 
             ApplicationConfiguration.Initialize();
-            Application.Run(new DemoForm(api));
+            Application.Run(new DemoForm());
         }
         else
         {
-            api.Publish("log", "Hello from another instance!");
+            ElixirKit.API.Publish("log", "Hello from another instance!");
         }
     }
 }
 
 class DemoForm : Form
 {
-    ElixirKit.API api;
-
-    public DemoForm(ElixirKit.API api)
+    public DemoForm()
     {
-        this.api = api;
         InitializeComponent();
     }
 
@@ -47,7 +42,7 @@ class DemoForm : Form
 
     private void button_Click(object? sender, EventArgs e)
     {
-        api.Publish("log", "button pressed!");
+        ElixirKit.API.Publish("log", "button pressed!");
     }
 
     // WinForms boilerplate below.