diff --git a/source/UserNode.d b/source/UserNode.d
index b9bc082..44d8eca 100644
--- a/source/UserNode.d
+++ b/source/UserNode.d
@@ -26,26 +26,8 @@ public final class UserNode
         initBox();
     }
 
-    private final class UserButton : Button
+    private void userButtonClick(Button)
     {
-        private string username;
-
-        this(string username)
-        {
-            this.username = username;
-        }
-
-        public string getUsername()
-        {
-            return username;
-        }
-    }
-
-    private void userButtonClick(Button e)
-    {
-        /* The Button will only ever be a UserButton */
-        UserButton button = cast(UserButton)e;
-
         /* Create a new ProfileWindow */
         ProfileWindow profileWindow = new ProfileWindow(connection, username);
     }
@@ -56,7 +38,7 @@ public final class UserNode
         box = new Box(GtkOrientation.HORIZONTAL, 10);
 
         /* Layout [Button (Prescence Icon)] - Label <username> - [Button (Reply Icon)]*/
-        UserButton userButton = new UserButton(username);
+        Button userButton = new Button();
         Image userButtonImg = new Image("user-available", GtkIconSize.BUTTON);
         userButton.setImage(userButtonImg);