diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java
index 10112ada0..6c1e71394 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java
@@ -49,20 +49,6 @@ import net.sourceforge.guacamole.GuacamoleException;
  */
 public interface AuthenticationProvider {
 
-    /**
-     * Returns the environment exposed by this AuthenticationProvider. The
-     * environment provides unrestricted access to all available users and
-     * configurations, though operations which permanently affect users and
-     * configurations are only possible through a UserContext.
-     * 
-     * @return An Environment containing all Users and GuacamoleConfigurations
-     *         currently available through this AuthenticationProvider.
-     * 
-     * @throws GuacamoleException If an error occurs while retrieving the
-     *                            environment.
-     */
-    Environment getEnvironment() throws GuacamoleException;
-    
     /**
      * Returns the UserContext of the user authorized by the given credentials.
      * 
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Environment.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Environment.java
deleted file mode 100644
index 01c83e6e2..000000000
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Environment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package net.sourceforge.guacamole.net.auth;
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is guacamole-ext.
- *
- * The Initial Developer of the Original Code is
- * Michael Jumper.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-import java.util.Map;
-import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
-
-
-/**
- * Represents the global set of available Users and GuacamoleConfigurations.
- * Every Environment has an associated Credentials that determine what Users
- * and GuacamoleConfigurations are visible in the Environment.
- * 
- * Note that if the available GuacamoleConfigurations or Users can change
- * externally, it is up to the implementation of the Environment to reload these
- * external changes if desired.
- * 
- * @author Michael Jumper
- */
-public interface Environment {
-
-    /**
-     * Returns a Map containing absolutely all GuacamoleConfigurations. The
-     * keys of this Map are Strings which uniquely identify each configuration.
-     *
-     * @return A Map of all configurations visible.
-     * @throws GuacamoleException If an error occurs while retrieving
-     *                            configurations.
-     */
-    Map<String, GuacamoleConfiguration> getConfigurations()
-            throws GuacamoleException;
-
-    /**
-     * Returns a Set containing absolutely all Users.
-     *
-     * @return A Set of all users.
-     * @throws GuacamoleException If an error occurs while retrieving
-     *                            users.
-     */
-    Set<User> getUsers() throws GuacamoleException;
-
-}