diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/control/Connect.java b/guacamole/client/src/net/sourceforge/guacamole/net/control/Connect.java
deleted file mode 100644
index cdbc20f5d..000000000
--- a/guacamole/client/src/net/sourceforge/guacamole/net/control/Connect.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.sourceforge.guacamole.net.control;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import javax.servlet.ServletRequest;
-
-import org.w3c.dom.Element;
-
-import net.sourceforge.guacamole.net.XMLGuacamoleServlet;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-public class Connect extends XMLGuacamoleServlet {
-   
-    protected boolean shouldCreateSession() {
-        return true;
-    }
-
-    @Override
-    protected void handleRequest(GuacamoleSession session, ServletRequest request, Element root) throws GuacamoleException {
-
-        try {
-            session.connect();
-        }
-        catch (GuacamoleException e) {
-            throw new GuacamoleException("Error connecting to server: " + e.getMessage(), e);
-        }
-
-    } 
-
-}
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/control/Disconnect.java b/guacamole/client/src/net/sourceforge/guacamole/net/control/Disconnect.java
deleted file mode 100644
index 35ab2b565..000000000
--- a/guacamole/client/src/net/sourceforge/guacamole/net/control/Disconnect.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.sourceforge.guacamole.net.control;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import javax.servlet.ServletRequest;
-
-import org.w3c.dom.Element;
-
-import net.sourceforge.guacamole.net.XMLGuacamoleServlet;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-public class Disconnect extends XMLGuacamoleServlet {
-   
-    @Override
-    protected void handleRequest(GuacamoleSession session, ServletRequest request, Element root) throws GuacamoleException {
-
-        try {
-            session.disconnect(); // Disconnect client.
-        }
-        catch (GuacamoleException e) {
-            throw new GuacamoleException("Error disconnecting from server: " + e.getMessage(), e);
-        }
-
-    } 
-
-}
diff --git a/guacamole/client/web/WEB-INF/web.xml b/guacamole/client/web/WEB-INF/web.xml
index f46926389..c61e6b842 100644
--- a/guacamole/client/web/WEB-INF/web.xml
+++ b/guacamole/client/web/WEB-INF/web.xml
@@ -27,22 +27,6 @@
         </session-timeout>
     </session-config>
     <!-- Servlets -->
-    <servlet>
-        <servlet-name>Connect</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.control.Connect</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Connect</servlet-name>
-        <url-pattern>/connect</url-pattern>
-    </servlet-mapping>
-    <servlet>
-        <servlet-name>Disconnect</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.control.Disconnect</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Disconnect</servlet-name>
-        <url-pattern>/disconnect</url-pattern>
-    </servlet-mapping>
     <servlet>
         <description>Instruction stream servlet.</description>
         <servlet-name>InstructionStream</servlet-name>