diff --git a/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
index 64f78e438..8bcfee07b 100644
--- a/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
+++ b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
@@ -31,8 +31,6 @@ import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 
 /**
  * Simple tunnel example with hard-coded configuration parameters.
- *
- * @author Michael Jumper
  */
 public class DummyGuacamoleTunnelServlet extends GuacamoleHTTPTunnelServlet {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java
index e64183c3d..c343be4c5 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java
@@ -32,8 +32,6 @@ import java.security.Principal;
 /**
  * Service providing convenience functions for the HTTP Header
  * AuthenticationProvider implementation.
- *
- * @author Nick Couchman
  */
 public class AuthenticationProviderService {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/ConfigurationService.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/ConfigurationService.java
index 7d483b0ba..2ab1350dc 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/ConfigurationService.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/ConfigurationService.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.environment.Environment;
 /**
  * Service for retrieving configuration information for HTTP header-based 
  * authentication.
- *
- * @author Nick Couchman
  */
 public class ConfigurationService {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProvider.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProvider.java
index 9c0957115..8729b0835 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProvider.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProvider.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * arbitrary external HTTP header. No storage for connections is
  * provided - only authentication. Storage must be provided by some other
  * extension.
- *
- * @author Nick Couchman
  */
 public class HTTPHeaderAuthenticationProvider implements AuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java
index 099e04c24..b0e755a2a 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.AuthenticationProvider;
 
 /**
  * Guice module which configures HTTP header-specific injections.
- *
- * @author Michael Jumper
  */
 public class HTTPHeaderAuthenticationProviderModule extends AbstractModule {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderGuacamoleProperties.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderGuacamoleProperties.java
index e31bbabcf..733a1f8cd 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderGuacamoleProperties.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderGuacamoleProperties.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.properties.StringGuacamoleProperty;
  * Provides properties required for use of the HTTP header 
  * authentication provider. These properties will be read from 
  * guacamole.properties when the HTTP authentication provider is used.
- *
- * @author Nick Couchman
  */
 public class HTTPHeaderGuacamoleProperties {
 
diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/user/AuthenticatedUser.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/user/AuthenticatedUser.java
index 0acff9721..793fef01e 100644
--- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/user/AuthenticatedUser.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.Credentials;
  * An HTTP header implementation of AuthenticatedUser, associating a
  * username and particular set of credentials with the HTTP authentication
  * provider.
- *
- * @author Michael Jumper
  */
 public class AuthenticatedUser extends AbstractAuthenticatedUser {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/AuthenticationProviderService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/AuthenticationProviderService.java
index 398910232..afdaf332b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/AuthenticationProviderService.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * Service which authenticates users based on credentials and provides for
  * the creation of corresponding, new UserContext objects for authenticated
  * users.
- *
- * @author Michael Jumper
  */
 public interface AuthenticationProviderService  {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/InjectedAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/InjectedAuthenticationProvider.java
index 08defc22e..4c5918b1c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/InjectedAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/InjectedAuthenticationProvider.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.net.auth.AuthenticatedUser;
  * means for Guice to (effectively) apply dependency injection to an
  * AuthenticationProvider, even though it is the AuthenticationProvider that
  * serves as the entry point.
- *
- * @author Michael Jumper
  */
 public abstract class InjectedAuthenticationProvider implements AuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
index 475282f9e..c9274dc7a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
@@ -83,9 +83,6 @@ import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider;
  * Guice module which configures the injections used by the JDBC authentication
  * provider base. This module MUST be included in the Guice injector, or
  * authentication providers based on JDBC will not function.
- *
- * @author Michael Jumper
- * @author James Muehlner
  */
 public class JDBCAuthenticationProviderModule extends MyBatisModule {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java
index 48fdf97cf..dd39f245b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java
@@ -39,8 +39,6 @@ import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsExce
  * AuthenticationProviderService implementation which authenticates users with
  * a username/password pair, producing new UserContext objects which are backed
  * by an underlying, arbitrary database.
- *
- * @author Michael Jumper
  */
 public class JDBCAuthenticationProviderService implements AuthenticationProviderService  {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
index c539ef5e1..dfbf0e9b5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.auth.jdbc.security.PasswordPolicy;
 /**
  * A JDBC-specific implementation of Environment that defines generic properties
  * intended for use within JDBC based authentication providers.
- *
- * @author James Muehlner
  */
 public abstract class JDBCEnvironment extends LocalEnvironment {
     
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCInjectorProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCInjectorProvider.java
index 839616e85..ea005b35f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCInjectorProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCInjectorProvider.java
@@ -35,8 +35,6 @@ import org.apache.guacamole.GuacamoleException;
  * classloader. Within the context of the JDBC extension, as long as each built
  * extension only provides one subclass of this class, things should work
  * properly, as each extension is given its own classloader by Guacamole.
- *
- * @author Michael Jumper
  */
 public abstract class JDBCInjectorProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
index d7d508191..b0d6324aa 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.Directory;
 /**
  * Implementation of a Directory which contains all currently-active
  * connections.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionDirectory extends RestrictedObject
     implements Directory<ActiveConnection> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
index efb24e610..91ad11d7e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
@@ -40,8 +40,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating active connections.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionPermissionService
     extends AbstractPermissionService<ObjectPermissionSet, ObjectPermission>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
index 6b92a8d36..5f5b9a408 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionSet;
 /**
  * An implementation of ObjectPermissionSet which uses an injected service to
  * query and manipulate the permissions associated with active connections.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionPermissionSet extends ObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
index 56405269f..5e459b154 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
@@ -38,8 +38,6 @@ import org.apache.guacamole.net.auth.ActiveConnection;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating active connections.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionService
     implements DirectoryObjectService<TrackedActiveConnection, ActiveConnection> { 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
index 642805d38..54245503d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.net.auth.credentials.UserCredentials;
 /**
  * An implementation of the ActiveConnection object which has an associated
  * ActiveConnectionRecord.
- *
- * @author Michael Jumper
  */
 public class TrackedActiveConnection extends RestrictedObject implements ActiveConnection {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ChildObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ChildObjectModel.java
index 5a458ca85..1d18e5936 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ChildObjectModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ChildObjectModel.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.auth.jdbc.base;
  * Object representation of a Guacamole object which can be the child of another
  * object, such as a connection or sharing profile, as represented in the
  * database.
- *
- * @author Michael Jumper
  */
 public abstract class ChildObjectModel extends ObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
index 987752110..590e01e9f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
@@ -30,7 +30,6 @@ import org.apache.guacamole.GuacamoleException;
  * within directories. This service will automatically enforce the permissions
  * of the current user.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The specific internal implementation of the type of object this service
  *     provides access to.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObject.java
index f086112df..124d45af4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObject.java
@@ -26,7 +26,6 @@ import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
  * the Directory class. All such objects will need the same base set of queries
  * to fulfill the needs of the Directory class.
  *
- * @author Michael Jumper
  * @param <ModelType>
  *     The type of model object that corresponds to this object.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObjectService.java
index a874210c9..74ca5bb34 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledChildDirectoryObjectService.java
@@ -34,7 +34,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
  * manipulating objects that can be children of other objects. This service will
  * automatically enforce the permissions of the current user.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The specific internal implementation of the type of object this service
  *     provides access to.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
index 840f60580..0d15373c4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
@@ -27,7 +27,6 @@ import org.apache.guacamole.net.auth.Identifiable;
  * such objects will need the same base set of queries to fulfill the needs of
  * the Directory class.
  *
- * @author Michael Jumper
  * @param <ModelType>
  *     The type of model object that corresponds to this object.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
index d6c567962..ebd95d905 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
@@ -29,7 +29,6 @@ import org.apache.ibatis.annotations.Param;
  * the Directory class. All such objects will need the same base set of queries
  * to fulfill the needs of the Directory class.
  *
- * @author Michael Jumper
  * @param <ModelType>
  *     The type of object contained within the directory whose objects are
  *     mapped by this mapper.
@@ -134,4 +133,4 @@ public interface ModeledDirectoryObjectMapper<ModelType> {
      */
     int update(@Param("object") ModelType object);
     
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
index c3e5e92d8..1ee9bee89 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
@@ -38,7 +38,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
  * manipulating objects within directories. This service will automatically
  * enforce the permissions of the current user.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The specific internal implementation of the type of object this service
  *     provides access to.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
index 2b9620d00..fa43c73e9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
@@ -26,7 +26,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledAuthenticatedUser;
  * JDBC-driven authentication providers, all modeled objects are also
  * restricted.
  *
- * @author Michael Jumper
  * @param <ModelType>
  *     The type of model object which corresponds to this object.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
index 06698acd3..833c0d993 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.auth.jdbc.base;
 /**
  * Object representation of a Guacamole object, such as a user or connection,
  * as represented in the database.
- *
- * @author Michael Jumper
  */
 public abstract class ObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
index 9bcc8ed4a..66979d487 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledAuthenticatedUser;
 /**
  * Common base class for objects that are associated with the users that
  * obtain them.
- *
- * @author Michael Jumper
  */
 public abstract class RestrictedObject {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
index 8172f8104..52a127df4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
@@ -33,9 +33,6 @@ import org.mybatis.guice.transactional.Transactional;
 /**
  * Implementation of the Connection Directory which is driven by an underlying,
  * arbitrary database.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ConnectionDirectory extends RestrictedObject
     implements Directory<Connection> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
index 61cccc578..9a4913242 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
@@ -26,8 +26,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for connection objects.
- *
- * @author Michael Jumper
  */
 public interface ConnectionMapper extends ModeledDirectoryObjectMapper<ConnectionModel> {
 
@@ -86,4 +84,4 @@ public interface ConnectionMapper extends ModeledDirectoryObjectMapper<Connectio
     ConnectionModel selectOneByName(@Param("parentIdentifier") String parentIdentifier,
             @Param("name") String name);
     
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
index 5e8a8f3e0..ac104551f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.auth.jdbc.base.ChildObjectModel;
 /**
  * Object representation of a Guacamole connection, as represented in the
  * database.
- *
- * @author Michael Jumper
  */
 public class ConnectionModel extends ChildObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterMapper.java
index 8ba3e24c8..75ef1cfaf 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterMapper.java
@@ -24,8 +24,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for connection parameter objects.
- *
- * @author Michael Jumper
  */
 public interface ConnectionParameterMapper {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterModel.java
index 4750de296..a09bae243 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionParameterModel.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.connection;
 
 /**
  * A single parameter name/value pair belonging to a connection.
- *
- * @author Michael Jumper
  */
 public class ConnectionParameterModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
index db7f17850..aefff9239 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.auth.jdbc.user.UserModel;
 
 /**
  * Mapper for connection record objects.
- *
- * @author Michael Jumper
  */
 public interface ConnectionRecordMapper {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
index 8e027fe8a..791ba7787 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
@@ -25,8 +25,6 @@ import java.util.Date;
  * A single connection record representing a past usage of a particular
  * connection. If the connection was being shared, the sharing profile used to
  * join the connection is included in the record.
- *
- * @author Michael Jumper
  */
 public class ConnectionRecordModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
index d6dc417b8..844eff7c0 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
@@ -28,8 +28,6 @@ import java.util.regex.Pattern;
  * A search term for querying historical connection records. This will contain
  * a the search term in string form and, if that string appears to be a date. a
  * corresponding date range.
- *
- * @author James Muehlner
  */
 public class ConnectionRecordSearchTerm {
     
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
index d58631678..f89a45028 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.net.auth.ConnectionRecord;
  * A JDBC implementation of ConnectionRecordSet. Calls to asCollection() will 
  * query connection history records from the database. Which records are
  * returned will be determined by the values passed in earlier.
- * 
- * @author James Muehlner
  */
 public class ConnectionRecordSet extends RestrictedObject
         implements org.apache.guacamole.net.auth.ConnectionRecordSet {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
index 66ce821fb..17f43806d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.ConnectionRecordSet;
 /**
  * A sort predicate which species the property to use when sorting connection
  * records, along with the sort order.
- *
- * @author James Muehlner
  */
 public class ConnectionRecordSortPredicate {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
index 85bf6d94a..f25632429 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
@@ -49,8 +49,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating connections.
- *
- * @author Michael Jumper, James Muehlner
  */
 public class ConnectionService extends ModeledChildDirectoryObjectService<ModeledConnection, Connection, ConnectionModel> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index ead81ec55..cbfdb68ca 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -46,9 +46,6 @@ import org.slf4j.LoggerFactory;
 /**
  * An implementation of the Connection object which is backed by a database
  * model.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionModel>
     implements Connection {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
index 33de621f5..2dc72dafb 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
@@ -25,9 +25,6 @@ import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A ConnectionRecord which is backed by a database model.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ModeledConnectionRecord implements ConnectionRecord {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
index d9cce6c52..f079bc7d5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
 /**
  * Implementation of GuacamoleConfiguration which loads parameter values only
  * if necessary, and only if allowed.
- *
- * @author Michael Jumper
  */
 public class ModeledGuacamoleConfiguration extends GuacamoleConfiguration {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
index 41c87d8f4..9f3930597 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
@@ -33,9 +33,6 @@ import org.mybatis.guice.transactional.Transactional;
 /**
  * Implementation of the ConnectionGroup Directory which is driven by an
  * underlying, arbitrary database.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ConnectionGroupDirectory extends RestrictedObject
     implements Directory<ConnectionGroup> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
index 6c4e6932c..c82069abe 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
@@ -26,8 +26,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for connection group objects.
- *
- * @author Michael Jumper
  */
 public interface ConnectionGroupMapper extends ModeledDirectoryObjectMapper<ConnectionGroupModel> {
 
@@ -86,4 +84,4 @@ public interface ConnectionGroupMapper extends ModeledDirectoryObjectMapper<Conn
     ConnectionGroupModel selectOneByName(@Param("parentIdentifier") String parentIdentifier,
             @Param("name") String name);
     
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
index 378457898..d58cc9b2e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.ConnectionGroup;
 /**
  * Object representation of a Guacamole connection group, as represented in the
  * database.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupModel extends ChildObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
index 20c3ce082..e23081c50 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
@@ -43,8 +43,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating connection groups.
- *
- * @author Michael Jumper, James Muehlner
  */
 public class ConnectionGroupService extends ModeledChildDirectoryObjectService<ModeledConnectionGroup,
         ConnectionGroup, ConnectionGroupModel> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
index 5fdf6f7e6..7e65c7f75 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
@@ -43,9 +43,6 @@ import org.slf4j.LoggerFactory;
 /**
  * An implementation of the ConnectionGroup object which is backed by a
  * database model.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ModeledConnectionGroup extends ModeledChildDirectoryObject<ConnectionGroupModel>
     implements ConnectionGroup {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
index 71a4690e7..d2e555132 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 /**
  * The root connection group, here represented as its own dedicated object as
  * the database does not contain an actual root group.
- *
- * @author Michael Jumper
  */
 public class RootConnectionGroup extends RestrictedObject
     implements ConnectionGroup {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
index d4a27c613..863548856 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
@@ -31,7 +31,6 @@ import org.apache.guacamole.net.auth.permission.PermissionSet;
  * Abstract PermissionService implementation which provides additional
  * convenience methods for enforcing the permission model.
  *
- * @author Michael Jumper
  * @param <PermissionSetType>
  *     The type of permission sets this service provides access to.
  *
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
index 433674af1..2843dd8f0 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
@@ -21,7 +21,5 @@ package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for connection group permissions.
- *
- * @author Michael Jumper
  */
 public interface ConnectionGroupPermissionMapper extends ObjectPermissionMapper {}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
index 965cb8ae9..68fc3ed4b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledUser;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting connection group permissions. This service will automatically
  * enforce the permissions of the current user.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupPermissionService extends ModeledObjectPermissionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
index 65b1e8d5b..1dac17dcf 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
@@ -25,8 +25,6 @@ import com.google.inject.Inject;
  * A database implementation of ObjectPermissionSet which uses an injected
  * service to query and manipulate the connection group permissions associated
  * with a particular user.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupPermissionSet extends ObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
index 1c5feb844..3cd8e7290 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
@@ -21,7 +21,5 @@ package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for connection permissions.
- *
- * @author Michael Jumper
  */
 public interface ConnectionPermissionMapper extends ObjectPermissionMapper {}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
index cc8198f12..80c4b0b43 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledUser;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting connection permissions. This service will automatically enforce the
  * permissions of the current user.
- *
- * @author Michael Jumper
  */
 public class ConnectionPermissionService extends ModeledObjectPermissionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
index d897aa453..e4e1836e3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
@@ -25,8 +25,6 @@ import com.google.inject.Inject;
  * A database implementation of ObjectPermissionSet which uses an injected
  * service to query and manipulate the connection permissions associated with
  * a particular user.
- *
- * @author Michael Jumper
  */
 public class ConnectionPermissionSet extends ObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
index 631dcdc3e..a4f1f3f1f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting object permissions within a backend database model. This service
  * will automatically enforce the permissions of the current user.
- *
- * @author Michael Jumper
  */
 public abstract class ModeledObjectPermissionService
     extends ModeledPermissionService<ObjectPermissionSet, ObjectPermission, ObjectPermissionModel>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
index 54155320f..28008451f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
@@ -36,7 +36,6 @@ import org.apache.guacamole.net.auth.permission.PermissionSet;
  * permission sets that contain these permissions. This service will
  * automatically enforce the permissions of the current user.
  *
- * @author Michael Jumper
  * @param <PermissionSetType>
  *     The type of permission sets this service provides access to.
  *
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
index df13c6ec2..ff8369ae3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermission;
 
 /**
  * Mapper for object-related permissions.
- *
- * @author Michael Jumper
  */
 public interface ObjectPermissionMapper extends PermissionMapper<ObjectPermissionModel> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
index c7396dfc7..3a7577266 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermission;
 /**
  * Object representation of an object-related Guacamole permission, as
  * represented in the database.
- *
- * @author Michael Jumper
  */
 public class ObjectPermissionModel extends PermissionModel<ObjectPermission.Type> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
index 4a92cb2b7..5eead24e1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting object permissions. This service will automatically enforce the
  * permissions of the current user.
- *
- * @author Michael Jumper
  */
 public interface ObjectPermissionService
     extends PermissionService<ObjectPermissionSet, ObjectPermission> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
index e210fd1c6..712a42242 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermission;
  * A database implementation of ObjectPermissionSet which uses an injected
  * service to query and manipulate the object-level permissions associated with
  * a particular user.
- *
- * @author Michael Jumper
  */
 public abstract class ObjectPermissionSet extends RestrictedObject
     implements org.apache.guacamole.net.auth.permission.ObjectPermissionSet {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
index 84a13d4d5..d49dc30c3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
@@ -26,7 +26,6 @@ import org.apache.ibatis.annotations.Param;
 /**
  * Generic base for mappers which handle permissions.
  *
- * @author Michael Jumper
  * @param <PermissionType>
  *     The type of permission model object handled by this mapper.
  */
@@ -67,4 +66,4 @@ public interface PermissionMapper<PermissionType> {
      */
     int delete(@Param("permissions") Collection<PermissionType> permissions);
 
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
index df331694a..fbc3e8de4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
@@ -23,7 +23,6 @@ package org.apache.guacamole.auth.jdbc.permission;
  * Generic base permission model which grants a permission of a particular type
  * to a specific user.
  *
- * @author Michael Jumper
  * @param <PermissionType>
  *     The type of permissions allowed within this model.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
index d9e9c9702..12b046b4d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
@@ -38,7 +38,6 @@ import org.apache.guacamole.net.auth.permission.PermissionSet;
  * these permissions. This service will automatically enforce the permissions
  * of the current user.
  *
- * @author Michael Jumper
  * @param <PermissionSetType>
  *     The type of permission sets this service provides access to.
  *
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionMapper.java
index a31b725db..3b6f26dd4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionMapper.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for sharing profile permissions.
- *
- * @author Michael Jumper
  */
 public interface SharingProfilePermissionMapper
         extends ObjectPermissionMapper {}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionService.java
index 9eeb6c979..ac16fc2c7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionService.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledUser;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting sharing profile permissions. This service will automatically enforce
  * the permissions of the current user.
- *
- * @author Michael Jumper
  */
 public class SharingProfilePermissionService extends ModeledObjectPermissionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionSet.java
index 77cb37e5d..13f6f30c6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SharingProfilePermissionSet.java
@@ -25,8 +25,6 @@ import com.google.inject.Inject;
  * A database implementation of ObjectPermissionSet which uses an injected
  * service to query and manipulate the sharing profile permissions associated
  * with a particular user.
- *
- * @author Michael Jumper
  */
 public class SharingProfilePermissionSet extends ObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
index e20c6938d..929d6e9aa 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * Mapper for system-level permissions.
- *
- * @author Michael Jumper
  */
 public interface SystemPermissionMapper extends PermissionMapper<SystemPermissionModel> {
 
@@ -47,4 +45,4 @@ public interface SystemPermissionMapper extends PermissionMapper<SystemPermissio
     SystemPermissionModel selectOne(@Param("user") UserModel user,
             @Param("type") SystemPermission.Type type);
 
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
index 6088e4e98..67e729853 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermission;
 /**
  * Object representation of an system-level Guacamole permission, as
  * represented in the database.
- *
- * @author Michael Jumper
  */
 public class SystemPermissionModel extends PermissionModel<SystemPermission.Type> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
index 23a378522..db1d81e61 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermission;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting system permissions. This service will automatically enforce
  * the permissions of the current user.
- *
- * @author Michael Jumper
  */
 public class SystemPermissionService
     extends ModeledPermissionService<SystemPermissionSet, SystemPermission, SystemPermissionModel> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
index 25019dfd3..9c84a84a4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermission;
  * A database implementation of SystemPermissionSet which uses an injected
  * service to query and manipulate the system permissions associated with a
  * particular user.
- *
- * @author Michael Jumper
  */
 public class SystemPermissionSet extends RestrictedObject
     implements org.apache.guacamole.net.auth.permission.SystemPermissionSet {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
index 7611d4d78..f7412a4fd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
@@ -21,7 +21,5 @@ package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for user permissions.
- *
- * @author Michael Jumper
  */
 public interface UserPermissionMapper extends ObjectPermissionMapper {}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
index 0957339f6..d56ed28bc 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.user.ModeledUser;
  * Service which provides convenience methods for creating, retrieving, and
  * deleting user permissions. This service will automatically enforce the
  * permissions of the current user.
- *
- * @author Michael Jumper
  */
 public class UserPermissionService extends ModeledObjectPermissionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
index 59d37b04c..fbf1914a9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
@@ -25,8 +25,6 @@ import com.google.inject.Inject;
  * A database implementation of ObjectPermissionSet which uses an injected
  * service to query and manipulate the user permissions associated with a
  * particular user.
- *
- * @author Michael Jumper
  */
 public class UserPermissionSet extends ObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordContainsUsernameException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordContainsUsernameException.java
index f3e70d7d8..2273ada77 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordContainsUsernameException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordContainsUsernameException.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.auth.jdbc.security;
 /**
  * Thrown when an attempt is made to set a user's password to a string which
  * contains their own username, in violation of the defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordContainsUsernameException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
index 248d70e35..b381e8435 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
@@ -21,7 +21,6 @@ package org.apache.guacamole.auth.jdbc.security;
 
 /**
  * A service to perform password encryption and checking.
- * @author James Muehlner
  */
 public interface PasswordEncryptionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordMinimumLengthException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordMinimumLengthException.java
index f6a9e4fef..b01be56d3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordMinimumLengthException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordMinimumLengthException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.language.TranslatableMessage;
 /**
  * Thrown when an attempt is made to set a user's password to a string which is
  * too short, in violation of the defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordMinimumLengthException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicy.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicy.java
index 3ee122a6c..c86f7fd0d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicy.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicy.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * A set of restrictions which define the level of complexity required for
  * the passwords of Guacamole user accounts.
- *
- * @author Michael Jumper
  */
 public interface PasswordPolicy {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyException.java
index b4b21b1ed..a917d9eda 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.language.TranslatableMessage;
 /**
  * Thrown when an attempt to change a user's password fails due to a violation
  * of password complexity policies.
- *
- * @author Michael Jumper
  */
 public class PasswordPolicyException extends GuacamoleClientException
     implements Translatable {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyService.java
index a9fbcf35b..148d5a2f9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordPolicyService.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.auth.jdbc.user.PasswordRecordModel;
 /**
  * Service which verifies compliance with the password policy configured via
  * guacamole.properties.
- *
- * @author Michael Jumper
  */
 public class PasswordPolicyService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresDigitException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresDigitException.java
index 78e7561ae..54c286584 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresDigitException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresDigitException.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.auth.jdbc.security;
  * Thrown when an attempt is made to set a user's password to a string which
  * contains no numeric characters (digits), in violation of the defined password
  * policy.
- *
- * @author Michael Jumper
  */
 public class PasswordRequiresDigitException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresMultipleCaseException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresMultipleCaseException.java
index 7911343f5..1d3400082 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresMultipleCaseException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresMultipleCaseException.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.auth.jdbc.security;
  * Thrown when an attempt is made to set a user's password to a string which
  * does not contain both uppercase and lowercase characters, in violation of the
  * defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordRequiresMultipleCaseException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresSymbolException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresSymbolException.java
index f2116fbb7..6076fe78a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresSymbolException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordRequiresSymbolException.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.auth.jdbc.security;
  * Thrown when an attempt is made to set a user's password to a string which
  * contains no non-alphanumeric characters (symbols), in violation of the
  * defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordRequiresSymbolException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordReusedException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordReusedException.java
index 3e3ad9b1e..c90226d05 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordReusedException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordReusedException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.language.TranslatableMessage;
 /**
  * Thrown when an attempt is made to reuse a previous password, in violation of
  * the defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordReusedException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordTooYoungException.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordTooYoungException.java
index a5235dce5..2e9793b19 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordTooYoungException.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordTooYoungException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.language.TranslatableMessage;
  * Thrown when an attempt is made to set a user's password before sufficient
  * time has elapsed since the password was last reset, in violation of the
  * defined password policy.
- *
- * @author Michael Jumper
  */
 public class PasswordTooYoungException extends PasswordPolicyException {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
index 69748d3bd..ebcd1cd0e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
@@ -25,8 +25,8 @@ import java.security.NoSuchAlgorithmException;
 import javax.xml.bind.DatatypeConverter;
 
 /**
- * Provides a SHA-256 based implementation of the password encryption functionality.
- * @author James Muehlner
+ * Provides a SHA-256 based implementation of the password encryption
+ * functionality.
  */
 public class SHA256PasswordEncryptionService implements PasswordEncryptionService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
index 10948ba8d..1ba0f6778 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
@@ -21,7 +21,6 @@ package org.apache.guacamole.auth.jdbc.security;
 
 /**
  * A service to generate password salts.
- * @author James Muehlner
  */
 public interface SaltService {
     /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
index 924ca7609..67f292a3e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
@@ -24,7 +24,6 @@ import java.security.SecureRandom;
 
 /**
  * Generates password salts via SecureRandom.
- * @author James Muehlner
  */
 public class SecureRandomSaltService implements SaltService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ConnectionSharingService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ConnectionSharingService.java
index 45951ec1e..efdecf045 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ConnectionSharingService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ConnectionSharingService.java
@@ -38,8 +38,6 @@ import org.apache.guacamole.net.auth.credentials.UserCredentials;
 
 /**
  * Service which provides convenience methods for sharing active connections.
- *
- * @author Michael Jumper
  */
 public class ConnectionSharingService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/HashSharedConnectionMap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/HashSharedConnectionMap.java
index 959d931b6..5b54b7ba7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/HashSharedConnectionMap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/HashSharedConnectionMap.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.auth.jdbc.sharing.connection.SharedConnectionDefinit
 
 /**
  * A HashMap-based implementation of the SharedConnectionMap.
- *
- * @author Michael Jumper
  */
 public class HashSharedConnectionMap implements SharedConnectionMap {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SecureRandomShareKeyGenerator.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SecureRandomShareKeyGenerator.java
index 87f7fc21c..f4a0249f8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SecureRandomShareKeyGenerator.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SecureRandomShareKeyGenerator.java
@@ -24,8 +24,6 @@ import java.security.SecureRandom;
 /**
  * An implementation of the ShareKeyGenerator which uses SecureRandom to
  * generate cryptographically-secure random sharing keys.
- * 
- * @author Michael Jumper
  */
 public class SecureRandomShareKeyGenerator extends SecureRandom
         implements ShareKeyGenerator {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ShareKeyGenerator.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ShareKeyGenerator.java
index 1cf97e175..edd3c7555 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ShareKeyGenerator.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/ShareKeyGenerator.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.auth.jdbc.sharing;
 /**
  * Produces unique keys that can be safely used for the automatically-generated
  * "sharing credentials" associated with a shared connection.
- * 
- * @author Michael Jumper
  */
 public interface ShareKeyGenerator {
     
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedAuthenticationProviderService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedAuthenticationProviderService.java
index 086b4324c..40df1e3d3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedAuthenticationProviderService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedAuthenticationProviderService.java
@@ -37,8 +37,6 @@ import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsExce
  * creation of corresponding UserContexts. The created UserContext objects are
  * restricted to the connections associated with those share keys via a common
  * ConnectionSharingService.
- *
- * @author Michael Jumper
  */
 public class SharedAuthenticationProviderService implements AuthenticationProviderService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionMap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionMap.java
index e33bc2d3b..c011e0080 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionMap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionMap.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.auth.jdbc.sharing.connection.SharedConnectionDefinit
 /**
  * Represents a mapping between share keys and the Guacamole connection being
  * shared.
- * 
- * @author Michael Jumper
  */
 public interface SharedConnectionMap {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedObjectManager.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedObjectManager.java
index c04148510..c96373d37 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedObjectManager.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedObjectManager.java
@@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * to register new objects after the SharedObjectManager has been invalidated
  * will cause the provided object to be immediately cleaned up.
  *
- * @author Michael Jumper
  * @param <T>
  *     The type of object managed by this SharedObjectManager.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnection.java
index e83656496..1c955dbd8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnection.java
@@ -37,8 +37,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
 /**
  * A Connection which joins an active connection, limited by restrictions
  * defined by a sharing profile.
- *
- * @author Michael Jumper
  */
 public class SharedConnection implements Connection {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDefinition.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDefinition.java
index bceda2537..cb48013a9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDefinition.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDefinition.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
  * active connection with a sharing profile. The sharing profile defines the
  * access provided to users of the shared active connection through its
  * connection parameters.
- *
- * @author Michael Jumper
  */
 public class SharedConnectionDefinition {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDirectory.java
index 441203c38..1fa86fadd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connection/SharedConnectionDirectory.java
@@ -38,8 +38,6 @@ import org.apache.guacamole.net.auth.Directory;
  * A Directory implementation which exposes an explicitly-registered set of
  * share keys as connections. Only explicitly-registered share keys are
  * accessible a SharedConnectionDirectory.
- *
- * @author Michael Jumper
  */
 public class SharedConnectionDirectory implements Directory<Connection> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connectiongroup/SharedRootConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connectiongroup/SharedRootConnectionGroup.java
index 732fef553..71b997c25 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connectiongroup/SharedRootConnectionGroup.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/connectiongroup/SharedRootConnectionGroup.java
@@ -37,8 +37,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
  * is statically defined, and all Connections which are intended to be contained
  * within an instance of SharedRootConnectionGroup MUST return that identifier
  * via getParentIdentifier().
- *
- * @author Michael Jumper
  */
 public class SharedRootConnectionGroup implements ConnectionGroup {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/permission/SharedObjectPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/permission/SharedObjectPermissionSet.java
index 18652bf5c..c8bf0df80 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/permission/SharedObjectPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/permission/SharedObjectPermissionSet.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.simple.SimpleObjectPermissionSet;
 /**
  * An immutable ObjectPermissionSet which defines only READ permissions for a
  * fixed set of identifiers.
- *
- * @author Michael Jumper
  */
 public class SharedObjectPermissionSet extends SimpleObjectPermissionSet {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedAuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedAuthenticatedUser.java
index 701ffd5ba..84166c658 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedAuthenticatedUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedAuthenticatedUser.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.Credentials;
 /**
  * Associates a user with the credentials they used to authenticate, including
  * any provided share key.
- *
- * @author Michael Jumper
  */
 public class SharedAuthenticatedUser extends RemoteAuthenticatedUser {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUser.java
index 2375f0666..57120ea1c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUser.java
@@ -37,8 +37,6 @@ import org.apache.guacamole.net.auth.simple.SimpleSystemPermissionSet;
  * An immutable implementation of User which defines READ permission for each of
  * the objects accessible through the various directories of a given
  * SharedUserContext.
- *
- * @author Michael Jumper
  */
 public class SharedUser implements User {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUserContext.java
index 672045068..21f97e31d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUserContext.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUserContext.java
@@ -45,8 +45,6 @@ import org.apache.guacamole.net.auth.simple.SimpleDirectory;
  * themselves, the any SharedConnections associated with that user via share
  * keys, and an internal root connection group containing only those
  * connections.
- *
- * @author Michael Jumper
  */
 public class SharedUserContext implements UserContext {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/ModeledSharingProfile.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/ModeledSharingProfile.java
index a300c23a4..19c70bb7e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/ModeledSharingProfile.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/ModeledSharingProfile.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.net.auth.SharingProfile;
 /**
  * An implementation of the SharingProfile object which is backed by a database
  * model.
- *
- * @author Michael Jumper
  */
 public class ModeledSharingProfile
         extends ModeledChildDirectoryObject<SharingProfileModel>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileDirectory.java
index 65512748e..632557052 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileDirectory.java
@@ -32,8 +32,6 @@ import org.mybatis.guice.transactional.Transactional;
 /**
  * Implementation of the SharingProfile Directory which is driven by an
  * underlying, arbitrary database.
- *
- * @author Michael Jumper
  */
 public class SharingProfileDirectory extends RestrictedObject
     implements Directory<SharingProfile> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileMapper.java
index f2904804a..11c9b8bed 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileMapper.java
@@ -24,8 +24,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for sharing profile objects.
- *
- * @author Michael Jumper
  */
 public interface SharingProfileMapper
         extends ModeledDirectoryObjectMapper<SharingProfileModel> {
@@ -49,4 +47,4 @@ public interface SharingProfileMapper
             @Param("parentIdentifier") String parentIdentifier,
             @Param("name") String name);
     
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileModel.java
index bf286de75..375282da8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileModel.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.auth.jdbc.base.ChildObjectModel;
 /**
  * Object representation of a Guacamole sharing profile, as represented in the
  * database.
- *
- * @author Michael Jumper
  */
 public class SharingProfileModel extends ChildObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterMapper.java
index 14dacaf2b..e3501d6fc 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterMapper.java
@@ -24,8 +24,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for sharing profile parameter objects.
- *
- * @author Michael Jumper
  */
 public interface SharingProfileParameterMapper {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterModel.java
index 0332b03f9..88c70f0a3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileParameterModel.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.sharingprofile;
 
 /**
  * A single parameter name/value pair belonging to a sharing profile.
- *
- * @author Michael Jumper
  */
 public class SharingProfileParameterModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileService.java
index 7d7e64f73..4b4d2d12f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharingprofile/SharingProfileService.java
@@ -41,8 +41,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating sharing profiles.
- *
- * @author Michael Jumper
  */
 public class SharingProfileService
         extends ModeledChildDirectoryObjectService<ModeledSharingProfile,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
index e178f7a8e..2e2c947e4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
@@ -66,8 +66,6 @@ import org.apache.guacamole.auth.jdbc.user.RemoteAuthenticatedUser;
  * Base implementation of the GuacamoleTunnelService, handling retrieval of
  * connection parameters, load balancing, and connection usage counts. The
  * implementation of concurrency rules is up to policy-specific subclasses.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
index e85b45443..48e838ad7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
@@ -31,8 +31,6 @@ import java.util.Set;
  * added or removed individually, and the overall list of current records
  * associated with a given object can be retrieved at any time. The public
  * methods of this class are all threadsafe.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionMultimap {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
index 3edd95cc7..1fe4143f2 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
@@ -39,8 +39,6 @@ import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
  * A connection record implementation that describes an active connection. As
  * the associated connection has not yet ended, getEndDate() will always return
  * null. The associated start date will be the time of this objects creation.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionRecord implements ConnectionRecord {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
index c7c7eef2a..34d929340 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
@@ -35,8 +35,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 /**
  * Service which creates pre-configured GuacamoleSocket instances for
  * connections and balancing groups, applying concurrent usage rules.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleTunnelService {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
index 06f0506ac..72cbffb3f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.InetGuacamoleSocket;
 /**
  * Implementation of GuacamoleSocket which connects via TCP to a given hostname
  * and port. If the socket is closed for any reason, a given task is run.
- *
- * @author Michael Jumper
  */
 public class ManagedInetGuacamoleSocket extends InetGuacamoleSocket {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
index 0bea008c0..8ce9e2151 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.SSLGuacamoleSocket;
 /**
  * Implementation of GuacamoleSocket which connects via SSL to a given hostname
  * and port. If the socket is closed for any reason, a given task is run.
- *
- * @author Michael Jumper
  */
 public class ManagedSSLGuacamoleSocket extends SSLGuacamoleSocket {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
index ca9234111..e68c9cb60 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
@@ -39,9 +39,6 @@ import org.apache.guacamole.auth.jdbc.user.RemoteAuthenticatedUser;
  * GuacamoleTunnelService implementation which restricts concurrency for each
  * connection and group according to a maximum number of connections and
  * maximum number of connections per user.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 @Singleton
 public class RestrictedGuacamoleTunnelService
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
index 81fb0c11b..e329a3b19 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.tunnel;
 
 /**
  * A unique pairing of user and connection or connection group.
- * 
- * @author Michael Jumper
  */
 public class Seat {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java
index 7e256bb5a..6d580baf6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.net.auth.Credentials;
  * Associates a user with the credentials they used to authenticate, their
  * corresponding ModeledUser, and the AuthenticationProvider which produced
  * that ModeledUser.
- *
- * @author Michael Jumper 
  */
 public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
index d3570030a..c2b16eff4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
@@ -56,9 +56,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of the User object which is backed by a database model.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ModeledUser extends ModeledDirectoryObject<UserModel> implements User {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java
index 1ec598102..fdeb64d5d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java
@@ -46,9 +46,6 @@ import org.apache.guacamole.net.auth.User;
 /**
  * UserContext implementation which is driven by an arbitrary, underlying
  * database.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class ModeledUserContext extends RestrictedObject
     implements org.apache.guacamole.net.auth.UserContext {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.java
index 21d36a87b..903ff6562 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.java
@@ -26,8 +26,6 @@ import org.apache.ibatis.annotations.Param;
 /**
  * Mapper for historical password records (users' prior passwords, along with
  * the dates they were set).
- *
- * @author Michael Jumper
  */
 public interface PasswordRecordMapper extends ModeledDirectoryObjectMapper<UserModel> {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordModel.java
index 4b34f8038..cfaaad514 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/PasswordRecordModel.java
@@ -24,8 +24,6 @@ import java.sql.Timestamp;
 /**
  * A single password record representing a previous password of a particular
  * user, along with the time/date that password was set.
- *
- * @author Michael Jumper
  */
 public class PasswordRecordModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java
index cb89b50b8..a3848f427 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * An AuthenticatedUser that has an associated remote host.
- *
- * @author Michael Jumper 
  */
 public abstract class RemoteAuthenticatedUser implements AuthenticatedUser {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
index f7c73df51..dffd8e2ec 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
@@ -33,9 +33,6 @@ import org.mybatis.guice.transactional.Transactional;
 /**
  * Implementation of the User Directory which is driven by an underlying,
  * arbitrary database.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class UserDirectory extends RestrictedObject
     implements Directory<User> {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
index dad119a5d..251445b62 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
@@ -24,8 +24,6 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * Mapper for user objects.
- *
- * @author Michael Jumper
  */
 public interface UserMapper extends ModeledDirectoryObjectMapper<UserModel> {
 
@@ -41,4 +39,4 @@ public interface UserMapper extends ModeledDirectoryObjectMapper<UserModel> {
      */
     UserModel selectOne(@Param("username") String username);
     
-}
\ No newline at end of file
+}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
index 5e81b3d72..4dfb27596 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.auth.jdbc.base.ObjectModel;
 
 /**
  * Object representation of a Guacamole user, as represented in the database.
- *
- * @author Michael Jumper
  */
 public class UserModel extends ObjectModel {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
index 5939b041c..76a05f857 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
@@ -53,8 +53,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Service which provides convenience methods for creating, retrieving, and
  * manipulating users.
- *
- * @author Michael Jumper, James Muehlner
  */
 public class UserService extends ModeledDirectoryObjectService<ModeledUser, User, UserModel> {
     
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
index e8ba3073b..1614cf389 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
@@ -26,9 +26,6 @@ import org.apache.guacamole.auth.jdbc.JDBCAuthenticationProviderService;
 /**
  * Provides a MySQL based implementation of the AuthenticationProvider
  * functionality.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class MySQLAuthenticationProvider extends InjectedAuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
index 35d69aab0..f4928c209 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
@@ -28,8 +28,6 @@ import org.mybatis.guice.datasource.helper.JdbcHelper;
 
 /**
  * Guice module which configures MySQL-specific injections.
- *
- * @author James Muehlner
  */
 public class MySQLAuthenticationProviderModule implements Module {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
index ef217b0fd..19a8ef448 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
@@ -28,9 +28,6 @@ import org.apache.guacamole.auth.jdbc.security.PasswordPolicy;
 /**
  * A MySQL-specific implementation of JDBCEnvironment provides database
  * properties specifically for MySQL.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class MySQLEnvironment extends JDBCEnvironment {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
index 7397f7a41..9039c029b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the MySQL Authentication plugin.
- *
- * @author James Muehlner
  */
 public class MySQLGuacamoleProperties {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLInjectorProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLInjectorProvider.java
index 09c40be7c..aa582fdcd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLInjectorProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLInjectorProvider.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.JDBCInjectorProvider;
  * JDBCInjectorProvider implementation which configures Guice injections for
  * connecting to a MySQL database based on MySQL-specific options provided via
  * guacamole.properties.
- *
- * @author Michael Jumper
  */
 public class MySQLInjectorProvider extends JDBCInjectorProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLPasswordPolicy.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLPasswordPolicy.java
index 513eb0eb5..bf8bbede8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLPasswordPolicy.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLPasswordPolicy.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 /**
  * PasswordPolicy implementation which reads the details of the policy from
  * MySQL-specific properties in guacamole.properties.
- *
- * @author Michael Jumper
  */
 public class MySQLPasswordPolicy implements PasswordPolicy {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLSharedAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLSharedAuthenticationProvider.java
index f9ae15e6b..11a6126ac 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLSharedAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLSharedAuthenticationProvider.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.auth.jdbc.sharing.SharedAuthenticationProviderServic
  * Provides a implementation of AuthenticationProvider which interacts with the
  * MySQL AuthenticationProvider, accepting share keys as credentials and
  * providing access to the shared connections.
- *
- * @author Michael Jumper
  */
 public class MySQLSharedAuthenticationProvider extends InjectedAuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
index f8ef00d9e..e91ab24fb 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
@@ -26,9 +26,6 @@ import org.apache.guacamole.auth.jdbc.JDBCAuthenticationProviderService;
 /**
  * Provides a PostgreSQL-based implementation of the AuthenticationProvider
  * functionality.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class PostgreSQLAuthenticationProvider extends InjectedAuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
index 0765a5d12..dc57ff700 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
@@ -28,9 +28,6 @@ import org.mybatis.guice.datasource.helper.JdbcHelper;
 
 /**
  * Guice module which configures PostgreSQL-specific injections.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class PostgreSQLAuthenticationProviderModule implements Module {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
index adce4be11..e0ee75ff1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.auth.jdbc.security.PasswordPolicy;
 /**
  * A PostgreSQL-specific implementation of JDBCEnvironment provides database
  * properties specifically for PostgreSQL.
- *
- * @author Michael Jumper
  */
 public class PostgreSQLEnvironment extends JDBCEnvironment {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
index e5b516c84..3da972fe7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
@@ -25,9 +25,6 @@ import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the PostgreSQL Authentication plugin.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class PostgreSQLGuacamoleProperties {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLInjectorProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLInjectorProvider.java
index ff34399c0..ae8f88fe8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLInjectorProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLInjectorProvider.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.jdbc.JDBCInjectorProvider;
  * JDBCInjectorProvider implementation which configures Guice injections for
  * connecting to a PostgreSQL database based on PostgreSQL-specific options
  * provided via guacamole.properties.
- *
- * @author Michael Jumper
  */
 public class PostgreSQLInjectorProvider extends JDBCInjectorProvider {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLPasswordPolicy.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLPasswordPolicy.java
index 1e46f9aaf..b35507df9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLPasswordPolicy.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLPasswordPolicy.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 /**
  * PasswordPolicy implementation which reads the details of the policy from
  * PostgreSQL-specific properties in guacamole.properties.
- *
- * @author Michael Jumper
  */
 public class PostgreSQLPasswordPolicy implements PasswordPolicy {
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLSharedAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLSharedAuthenticationProvider.java
index c2f78c3ec..430eb7aa5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLSharedAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLSharedAuthenticationProvider.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.auth.jdbc.sharing.SharedAuthenticationProviderServic
  * Provides a implementation of AuthenticationProvider which interacts with the
  * PostgreSQL AuthenticationProvider, accepting share keys as credentials and
  * providing access to the shared connections.
- *
- * @author Michael Jumper
  */
 public class PostgreSQLSharedAuthenticationProvider extends InjectedAuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
index 6e4529425..a25c697e6 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Service providing convenience functions for the LDAP AuthenticationProvider
  * implementation.
- *
- * @author Michael Jumper
  */
 public class AuthenticationProviderService {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
index 04847dcff..a13eb9715 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.environment.Environment;
 
 /**
  * Service for retrieving configuration information regarding the LDAP server.
- *
- * @author Michael Jumper
  */
 public class ConfigurationService {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
index 463c4d5f9..6ae5b012c 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.auth.ldap;
 /**
  * All possible encryption methods which may be used when connecting to an LDAP
  * server.
- *
- * @author Michael Jumper
  */
 public enum EncryptionMethod {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
index 22cf6a59e..575375656 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.properties.GuacamoleProperty;
  * "none", "ssl", and "starttls" are each parsed to their corresponding values
  * within the EncryptionMethod enum. All other string values result in parse
  * errors.
- *
- * @author Michael Jumper
  */
 public abstract class EncryptionMethodProperty implements GuacamoleProperty<EncryptionMethod> {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
index 39d98344e..5dce2447e 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.ldap;
 
 /**
  * Service for escaping LDAP filters, distinguished names (DN's), etc.
- *
- * @author Michael Jumper
  */
 public class EscapingService {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
index 48040b6b7..001f2c6ec 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * Allows users to be authenticated against an LDAP server. Each user may have
  * any number of authorized configurations. Authorized configurations may be
  * shared.
- *
- * @author Michael Jumper
  */
 public class LDAPAuthenticationProvider implements AuthenticationProvider {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
index ae7b77ccf..ead26bcd2 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.net.auth.AuthenticationProvider;
 
 /**
  * Guice module which configures LDAP-specific injections.
- *
- * @author Michael Jumper
  */
 public class LDAPAuthenticationProviderModule extends AbstractModule {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
index 518c5765d..bf0534c64 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Service for creating and managing connections to LDAP servers.
- *
- * @author Michael Jumper
  */
 public class LDAPConnectionService {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
index 39eb15d76..bc684e32c 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.properties.StringGuacamoleProperty;
  * Provides properties required for use of the LDAP authentication provider.
  * These properties will be read from guacamole.properties when the LDAP
  * authentication provider is used.
- *
- * @author Michael Jumper
  */
 public class LDAPGuacamoleProperties {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
index 07ebef99c..908d922f3 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.properties.GuacamoleProperty;
  * compatibility with the behavior of Java properties in general, only
  * whitespace at the beginning of each value is ignored; trailing whitespace
  * becomes part of the value.
- *
- * @author Michael Jumper
  */
 public abstract class StringListProperty implements GuacamoleProperty<List<String>> {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
index cb1350e23..b13207a15 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
@@ -46,8 +46,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Service for querying the connections available to a particular Guacamole
  * user according to an LDAP directory.
- *
- * @author Michael Jumper
  */
 public class ConnectionService {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
index 9ae7a7d1b..669efcd54 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.Credentials;
 /**
  * An LDAP-specific implementation of AuthenticatedUser, associating a
  * particular set of credentials with the LDAP authentication provider.
- *
- * @author Michael Jumper
  */
 public class AuthenticatedUser extends AbstractAuthenticatedUser {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
index 62125178b..0f693fb34 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
@@ -47,8 +47,6 @@ import org.slf4j.LoggerFactory;
 /**
  * An LDAP-specific implementation of UserContext which queries all Guacamole
  * connections and users from the LDAP directory.
- *
- * @author Michael Jumper
  */
 public class UserContext implements org.apache.guacamole.net.auth.UserContext {
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
index 912726e29..cae1599ef 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
@@ -43,8 +43,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Service for queries the users visible to a particular Guacamole user
  * according to an LDAP directory.
- *
- * @author Michael Jumper
  */
 public class UserService {
 
diff --git a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
index d0dea8a56..abf823f34 100644
--- a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
+++ b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
@@ -29,8 +29,6 @@ import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * XML parser for the configuration file used by the NoAuth auth provider.
- *
- * @author Laurent Meunier
  */
 public class NoAuthConfigContentHandler extends DefaultHandler {
 
diff --git a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
index b0291f805..69af5b7ff 100644
--- a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
+++ b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
@@ -62,8 +62,6 @@ import org.xml.sax.helpers.XMLReaderFactory;
  *      <param name="port" value="3389" />
  *    </config>
  *  </configs>
- *
- * @author Laurent Meunier
  */
 public class NoAuthenticationProvider extends SimpleAuthenticationProvider {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
index 1b7c896d0..052f5dabc 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which is thrown when data has been submitted with an unsupported
  * mimetype.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleClientBadTypeException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
index 2bbf090b9..f219fa403 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * A generic exception thrown when part of the Guacamole API encounters
  * an error in the client's request. Such an error, if correctable, usually
  * requires correction on the client side, not the server.
- *
- * @author Michael Jumper
  */
 public class GuacamoleClientException extends GuacamoleException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
index 816a85340..1801da166 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * usually indicates that a server-side buffer is not large enough to
  * accommodate the data, or protocol specifications prohibit data of the size
  * received.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleClientOverrunException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
index 93a5ab30f..230004bc0 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 
 /**
  * An exception which is thrown when the client is taking too long to respond.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleClientTimeoutException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
index ad0f4894b..4f75d8823 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * An exception which is thrown when too many requests have been received
  * by the current client, and further requests are being rejected, either
  * temporarily or permanently.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleClientTooManyException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
index c6f708d6b..578e3416e 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which is thrown when an operation cannot be performed because
  * its corresponding connection is closed.
- *
- * @author Michael Jumper
  */
 public class GuacamoleConnectionClosedException extends GuacamoleServerException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
index 8d4206cff..1b2226df3 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * A generic exception thrown when parts of the Guacamole API encounter
  * errors.
- *
- * @author Michael Jumper
  */
 public class GuacamoleException extends Exception {
     
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
index 80c75d111..c9ce5a138 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * An exception which is thrown when a resource has been requested, but that
  * resource is locked or currently in use, and cannot be accessed by the
  * current user.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleResourceConflictException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
index cb4e9e0d1..eb9488f53 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * A generic exception thrown when part of the Guacamole API fails to find
  * a requested resource, such as a configuration or tunnel.
- *
- * @author Michael Jumper
  */
 public class GuacamoleResourceNotFoundException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
index 91f32e489..cef9abd2f 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * A security-related exception thrown when parts of the Guacamole API is
  * denying access to a resource.
- *
- * @author Michael Jumper
  */
 public class GuacamoleSecurityException extends GuacamoleClientException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
index 4aba6ffbd..02dc893c1 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which is thrown when the server is too busy to service the
  * request.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleServerBusyException extends GuacamoleServerException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
index 8bba0487c..576915e91 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * A generic exception thrown when part of the Guacamole API encounters
  * an unexpected, internal error. An internal error, if correctable, would
  * require correction on the server side, not the client.
- *
- * @author Michael Jumper
  */
 public class GuacamoleServerException extends GuacamoleException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
index 4efde3386..03e41aa2f 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * A security-related exception thrown when parts of the Guacamole API is
  * denying access to a resource, but access MAY be granted were the user
  * authorized (logged in).
- *
- * @author Michael Jumper
  */
 public class GuacamoleUnauthorizedException extends GuacamoleSecurityException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
index 2e6950a24..0507d9569 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which is thrown when the requested operation is unsupported
  * or unimplemented.
- *
- * @author Michael Jumper
  */
 public class GuacamoleUnsupportedException extends GuacamoleServerException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
index 688021f16..acc916d5e 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which indicates than an upstream server (such as the remote
  * desktop) is returning an error or is otherwise unreachable.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleUpstreamException extends GuacamoleException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
index 349b848b4..284ccd93e 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
 /**
  * An exception which indicates than an upstream server (such as the remote
  * desktop) is taking too long to respond.
- * 
- * @author Michael Jumper
  */
 public class GuacamoleUpstreamTimeoutException extends GuacamoleUpstreamException {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
index a862d67c3..6ba5476d8 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleInstruction;
 /**
  * Provides abstract and raw character read access to a stream of Guacamole
  * instructions.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleReader {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
index e859456b2..e0516a6ff 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleInstruction;
 /**
  * Provides abstract and raw character write access to a stream of Guacamole
  * instructions.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleWriter {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
index 4c5433554..03caaa43a 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
@@ -35,8 +35,6 @@ import org.apache.guacamole.protocol.GuacamoleInstruction;
 /**
  * A GuacamoleReader which wraps a standard Java Reader, using that Reader as
  * the Guacamole instruction stream.
- *
- * @author Michael Jumper
  */
 public class ReaderGuacamoleReader implements GuacamoleReader {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
index 4063d97cc..154fe0ba9 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.protocol.GuacamoleInstruction;
 /**
  * A GuacamoleWriter which wraps a standard Java Writer, using that Writer as
  * the Guacamole instruction stream.
- *
- * @author Michael Jumper
  */
 public class WriterGuacamoleWriter implements GuacamoleWriter {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
index 38a239cbf..41ab03f07 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.io.GuacamoleWriter;
  * Base GuacamoleTunnel implementation which synchronizes access to the
  * underlying reader and writer with reentrant locks. Implementations need only
  * provide the tunnel's UUID and socket.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractGuacamoleTunnel implements GuacamoleTunnel {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
index 93b78d5e0..f71738e92 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.io.GuacamoleWriter;
 /**
  * GuacamoleTunnel implementation which simply delegates all function calls to
  * an underlying GuacamoleTunnel.
- *
- * @author Michael Jumper
  */
 public class DelegatingGuacamoleTunnel implements GuacamoleTunnel {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
index ae431e612..4d084e465 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * Provides abstract socket-like access to a Guacamole connection.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleSocket {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
index 77c00e1f2..9c91478f1 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.io.GuacamoleWriter;
 /**
  * Provides a unique identifier and synchronized access to the GuacamoleReader
  * and GuacamoleWriter associated with a GuacamoleSocket.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleTunnel {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
index fe6b92e60..29ad5b3cd 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
@@ -43,8 +43,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides abstract socket-like access to a Guacamole connection over a given
  * hostname and port.
- *
- * @author Michael Jumper
  */
 public class InetGuacamoleSocket implements GuacamoleSocket {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
index 887221712..25407853e 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides abstract socket-like access to a Guacamole connection over SSL to
  * a given hostname and port.
- *
- * @author Michael Jumper
  */
 public class SSLGuacamoleSocket implements GuacamoleSocket {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
index f763d0f17..18dd253f1 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
@@ -25,8 +25,6 @@ import java.util.UUID;
 /**
  * GuacamoleTunnel implementation which uses a provided socket. The UUID of
  * the tunnel will be randomly generated.
- *
- * @author Michael Jumper
  */
 public class SimpleGuacamoleTunnel extends AbstractGuacamoleTunnel {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
index 03e80f990..cf43b68f1 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.net.GuacamoleSocket;
  * a specific configuration while disallowing the client that will be using
  * this GuacamoleSocket from manually controlling the initial protocol
  * handshake.
- *
- * @author Michael Jumper
  */
 public class ConfiguredGuacamoleSocket implements GuacamoleSocket {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
index e12b3e420..52184f120 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.io.GuacamoleReader;
  * GuacamoleReader which applies a given GuacamoleFilter to observe or alter all
  * read instructions. Instructions may also be dropped or denied by the the
  * filter.
- *
- * @author Michael Jumper
  */
 public class FilteredGuacamoleReader implements GuacamoleReader {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
index ddfb79546..5e541d0e3 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.GuacamoleSocket;
 /**
  * Implementation of GuacamoleSocket which allows individual instructions to be
  * intercepted, overridden, etc.
- *
- * @author Michael Jumper
  */
 public class FilteredGuacamoleSocket implements GuacamoleSocket {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
index 0b12721cf..633d215db 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.io.GuacamoleWriter;
  * GuacamoleWriter which applies a given GuacamoleFilter to observe or alter
  * all written instructions. Instructions may also be dropped or denied by
  * the filter.
- *
- * @author Michael Jumper
  */
 public class FilteredGuacamoleWriter implements GuacamoleWriter {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
index 9f3be7239..d90d05d3f 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
@@ -26,8 +26,6 @@ import java.util.List;
 /**
  * An abstract representation of Guacamole client information, including all
  * information required by the Guacamole protocol during the preamble.
- *
- * @author Michael Jumper
  */
 public class GuacamoleClientInformation {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
index 206d71482..48d7e523c 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
@@ -29,8 +29,6 @@ import java.util.Set;
 /**
  * All information necessary to complete the initial protocol handshake of a
  * Guacamole session.
- *
- * @author Michael Jumper
  */
 public class GuacamoleConfiguration implements Serializable {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
index 5519dc130..dd2f3a38f 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.GuacamoleException;
  * Interface which provides for the filtering of individual instructions. Each
  * filtered instruction may be allowed through untouched, modified, replaced,
  * dropped, or explicitly denied.
- *
- * @author Michael Jumper
  */
 public interface GuacamoleFilter {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
index e140558fe..072c3f172 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
@@ -27,8 +27,6 @@ import java.util.List;
 /**
  * An abstract representation of a Guacamole instruction, as defined by the
  * Guacamole protocol.
- *
- * @author Michael Jumper
  */
 public class GuacamoleInstruction {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
index d4eda56ef..98eb548fb 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.GuacamoleServerException;
  * Parser for the Guacamole protocol. Arbitrary instruction data is appended,
  * and instructions are returned as a result. Invalid instructions result in
  * exceptions.
- *
- * @author Michael Jumper
  */
 public class GuacamoleParser implements Iterator<GuacamoleInstruction> {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
index a5e84c689..b94268df3 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.protocol;
 /**
  * All possible statuses returned by various Guacamole instructions, each having
  * a corresponding code.
- * 
- * @author Michael Jumper
  */
 public enum GuacamoleStatus {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
index dea136827..ff68b0c6c 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
@@ -31,8 +31,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
  * such thread. Because the HTTP tunnel requires the stream to be split across
  * multiple requests, tracking of activity on the tunnel must be performed
  * independently of the HTTP requests.
- *
- * @author Michael Jumper
  */
 class GuacamoleHTTPTunnel extends DelegatingGuacamoleTunnel {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
index 2c25df59a..eaa2fcf1c 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
  * and closing tunnels which have not been used recently. This class is
  * intended for use only within the GuacamoleHTTPTunnelServlet implementation,
  * and has no real utility outside that implementation.
- *
- * @author Michael Jumper
  */
 class GuacamoleHTTPTunnelMap {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 40d7ca285..fdbfb8edc 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -44,8 +44,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A HttpServlet implementing and abstracting the operations required by the
  * HTTP implementation of the JavaScript Guacamole client's tunnel.
- *
- * @author Michael Jumper
  */
 public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
 
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
index 60eeda58e..3afb87243 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Provides abstract access to the tunnels associated with a Guacamole session.
- *
- * @author Michael Jumper
  */
 @Deprecated
 public class GuacamoleSession {
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
index e5943ebf3..0cae732bb 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
@@ -46,8 +46,6 @@ import org.slf4j.LoggerFactory;
  * the Guacamole.WebSocketTunnel object included with the JavaScript API.
  * Messages sent/received are simply chunks of the Guacamole protocol
  * instruction stream.
- *
- * @author Michael Jumper
  */
 public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
 
diff --git a/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java b/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
index 95c8b1b33..576c55aae 100644
--- a/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
@@ -28,8 +28,6 @@ import static org.junit.Assert.*;
 /**
  * Tests the ReaderGuacamoleReader implementation of GuacamoleReader, validating
  * that instructions are parsed correctly.
- *
- * @author Michael Jumper
  */
 public class ReaderGuacamoleReaderTest {
 
diff --git a/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
index fcdfa2253..b766c734a 100644
--- a/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
@@ -29,8 +29,6 @@ import org.junit.Test;
 /**
  * Test which validates filtering of Guacamole instructions with
  * FilteredGuacamoleReader.
- *
- * @author Michael Jumper
  */
 public class FilteredGuacamoleReaderTest {
 
diff --git a/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
index c5bc33548..7b15550b0 100644
--- a/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
@@ -29,8 +29,6 @@ import org.junit.Test;
 /**
  * Test which validates filtering of Guacamole instructions with
  * FilteredGuacamoleWriter.
- *
- * @author Michael Jumper
  */
 public class FilteredGuacamoleWriterTest {
 
diff --git a/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
index b721e9dbb..d5d89de20 100644
--- a/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
@@ -26,8 +26,6 @@ import org.junit.Test;
 /**
  * Unit test for GuacamoleParser. Verifies that parsing of the Guacamole
  * protocol works as required.
- *
- * @author Michael Jumper
  */
 public class GuacamoleParserTest {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java b/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
index 65e73c7db..445f1efe7 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
@@ -31,8 +31,6 @@ import org.apache.guacamole.protocols.ProtocolInfo;
 /**
  * The environment of an arbitrary Guacamole instance, describing available
  * protocols, configuration parameters, and the GUACAMOLE_HOME directory.
- *
- * @author Michael Jumper
  */
 public interface Environment {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java b/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
index 6a05da104..74adaea84 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
@@ -39,8 +39,6 @@ import org.slf4j.LoggerFactory;
  * The environment of the locally-running Guacamole instance, describing
  * available protocols, configuration parameters, and the GUACAMOLE_HOME
  * directory.
- *
- * @author Michael Jumper
  */
 public class LocalEnvironment implements Environment {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
index f50c12257..032c503dc 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
@@ -26,8 +26,6 @@ import java.util.Collections;
  * field may be blank, but that its sole non-blank value is the value provided.
  * The provided value represents "true" while all other values, including
  * having no associated value, represent "false".
- *
- * @author Michael Jumper
  */
 public class BooleanField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
index 3fa9c8914..d7c6bed42 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
@@ -27,8 +27,6 @@ import java.util.Date;
 /**
  * Represents a date field. The field may contain only date values which
  * conform to a standard pattern, defined by DateField.FORMAT.
- *
- * @author Michael Jumper
  */
 public class DateField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
index 8cce5b655..1c07bafbb 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
@@ -24,8 +24,6 @@ import java.util.Collection;
 /**
  * Represents an arbitrary field with a finite, enumerated set of possible
  * values.
- *
- * @author Michael Jumper
  */
 public class EnumField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
index 8b306e947..dba10654c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
@@ -29,8 +29,6 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
  * defined by the type string. The behavior of each field type is defined
  * either through the web application itself (see FormService.js) or through
  * extensions.
- *
- * @author Michael Jumper
  */
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
 public class Field {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
index 9d78b7e63..30d4c5377 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
@@ -23,8 +23,6 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 /**
  * Describes an available legal value for an enumerated field.
- *
- * @author Michael Jumper
  */
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
 public class FieldOption {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
index 767cb6bd4..bdbd04f21 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
@@ -25,8 +25,6 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 /**
  * Information which describes logical set of fields.
- *
- * @author Michael Jumper
  */
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
 public class Form {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
index 171287b9d..88741ecf5 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.form;
 
 /**
  * Represents a field which can contain multiple lines of text.
- *
- * @author Michael Jumper
  */
 public class MultilineField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
index fa2caf842..cc2e2a548 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.form;
 
 /**
  * Represents a field which may contain only integer values.
- *
- * @author Michael Jumper
  */
 public class NumericField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
index 609662a62..1bc3d4f03 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.form;
 /**
  * Represents a field which contains sensitive text information related to
  * authenticating a user.
- *
- * @author Michael Jumper
  */
 public class PasswordField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
index 69a8a0560..088077102 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.form;
 /**
  * Represents a basic text field. The field may generally contain any data, but
  * may not contain multiple lines.
- *
- * @author Michael Jumper
  */
 public class TextField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
index 47b4fd6f9..78333621d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
@@ -27,8 +27,6 @@ import java.util.Date;
 /**
  * Represents a time field. The field may contain only time values which
  * conform to a standard pattern, defined by TimeField.FORMAT.
- *
- * @author Michael Jumper
  */
 public class TimeField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
index 3757391a1..93054101b 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.form;
 /**
  * Represents a time zone field. The field may contain only valid time zone IDs,
  * as dictated by TimeZone.getAvailableIDs().
- *
- * @author Michael Jumper
  */
 public class TimeZoneField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
index 1e65a0a5f..0e78514c0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.form;
 /**
  * Represents a text field which will contain the uniquely-identifying name of
  * a user.
- *
- * @author Michael Jumper
  */
 public class UsernameField extends Field {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/language/Translatable.java b/guacamole-ext/src/main/java/org/apache/guacamole/language/Translatable.java
index 034d98530..e85cdc834 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/language/Translatable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/language/Translatable.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.language;
  * An object which is associated with a translatable message that can be passed
  * through an arbitrary translation service, producing a human-readable message
  * in the user's native language.
- *
- * @author Michael Jumper
  */
 public interface Translatable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/language/TranslatableMessage.java b/guacamole-ext/src/main/java/org/apache/guacamole/language/TranslatableMessage.java
index 4aeba9ab1..cb6aa3e2d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/language/TranslatableMessage.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/language/TranslatableMessage.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.language;
  * A message which can be translated using a translation service, providing a
  * translation key and optional set of values to be substituted into the
  * translation string associated with that key.
- *
- * @author Michael Jumper
  */
 public class TranslatableMessage {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
index 9faacc03c..eacb0ba7f 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
 /**
  * Base implementation of an ActiveConnection, providing storage and simply
  * getters/setters for its main properties.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractActiveConnection extends AbstractIdentifiable
         implements ActiveConnection {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
index 3d6739dc6..730eec004 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth;
 /**
  * Basic implementation of an AuthenticatedUser which uses the username to
  * determine equality. Username comparison is case-sensitive.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractAuthenticatedUser extends AbstractIdentifiable
         implements AuthenticatedUser {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
index 3a751367c..c3a8fe37c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Basic implementation of a Guacamole connection.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractConnection extends AbstractIdentifiable
         implements Connection {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
index d5241fa7f..b3488b3a9 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.net.auth;
 
 /**
  * Basic implementation of a Guacamole connection group.
- *
- * @author James Muehlner
  */
 public abstract class AbstractConnectionGroup extends AbstractIdentifiable
         implements ConnectionGroup {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractIdentifiable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractIdentifiable.java
index 60cd6050c..3401719d4 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractIdentifiable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractIdentifiable.java
@@ -24,8 +24,6 @@ package org.apache.guacamole.net.auth;
  * Abstract implementation of Identifiable which provides equals() and
  * hashCode() implementations which use the identifier to determine equality.
  * The identifier comparison is case-sensitive.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractIdentifiable implements Identifiable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractSharingProfile.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractSharingProfile.java
index 0a664f2f3..ac9275f56 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractSharingProfile.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractSharingProfile.java
@@ -25,8 +25,6 @@ import java.util.Map;
 /**
  * Base implementation of a sharing profile which can be used to share a
  * Guacamole connection.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractSharingProfile implements SharingProfile {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
index 6232bc673..2dae70235 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth;
 /**
  * Basic implementation of a Guacamole user which uses the username to
  * determine equality. Username comparison is case-sensitive.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractUser extends AbstractIdentifiable
         implements User {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
index 6f3360063..ad1d6d37d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
 /**
  * A pairing of username and GuacamoleTunnel representing an active usage of a
  * particular connection.
- *
- * @author Michael Jumper
  */
 public interface ActiveConnection extends Identifiable, Shareable<SharingProfile> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
index b121abff4..7f363f28d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth;
 /**
  * A user of the Guacamole web application who has been authenticated by an
  * AuthenticationProvider.
- *
- * @author Michael Jumper
  */
 public interface AuthenticatedUser extends Identifiable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
index 13557450b..977b3b620 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.GuacamoleException;
  * Provides means of authorizing users and for accessing and managing data
  * associated with those users. Access to such data is limited according to the
  * AuthenticationProvider implementation.
- *
- * @author Michael Jumper
  */
 public interface AuthenticationProvider {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
index 31641a75a..7face9264 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * An object which Guacamole can connect to.
- *
- * @author Michael Jumper
  */
 public interface Connectable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
index 99930002d..b0795e2a1 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
  * human-readable identifier, and abstracts the connection process. The
  * backing GuacamoleConfiguration may be intentionally obfuscated or tokenized
  * to protect sensitive configuration information.
- *
- * @author Michael Jumper
  */
 public interface Connection extends Identifiable, Connectable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
index eeb549d1e..8e34e416a 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * Represents a connection group, which can contain both other connection groups
  * as well as connections.
- *
- * @author James Muehlner
  */
 public interface ConnectionGroup extends Identifiable, Connectable {
   
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
index b6b0c06f9..95c5f6ca1 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
@@ -24,8 +24,6 @@ import java.util.Date;
 /**
  * A logging record describing when a user started and ended usage of a
  * particular connection.
- *
- * @author Michael Jumper
  */
 public interface ConnectionRecord {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
index 3bdbf3088..5198cfa80 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
@@ -24,9 +24,6 @@ import org.apache.guacamole.GuacamoleException;
 
 /**
  * The set of all available connection records, or a subset of those records.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public interface ConnectionRecordSet {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
index d9ea2d66f..142c51653 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
@@ -31,8 +31,6 @@ import javax.servlet.http.HttpSession;
  *
  * This class is used along with AuthenticationProvider to provide arbitrary
  * HTTP-based authentication for Guacamole.
- *
- * @author Michael Jumper
  */
 public class Credentials implements Serializable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
index 38b1759a0..287145fc0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
@@ -29,7 +29,6 @@ import org.apache.guacamole.GuacamoleException;
  * are not necessarily backed by the stored objects, thus updating an object
  * always requires calling the update() function.
  *
- * @author Michael Jumper
  * @param <ObjectType>
  *     The type of objects stored within this Directory.
  */
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
index d65b09caf..d32fec063 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
@@ -22,8 +22,6 @@ package org.apache.guacamole.net.auth;
 /**
  * An object which has a deterministic, unique identifier, which may not be
  * null.
- *
- * @author Michael Jumper
  */
 public interface Identifiable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Shareable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Shareable.java
index 190f1a423..f5ad400d0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Shareable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Shareable.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.net.auth.credentials.UserCredentials;
  * @param <T>
  *     The type of object which dictates the semantics/restrictions of shared
  *     objects.
- *
- * @author Michael Jumper
  */
 public interface Shareable<T> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/SharingProfile.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/SharingProfile.java
index 9c12a1543..f9ec34c84 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/SharingProfile.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/SharingProfile.java
@@ -24,8 +24,6 @@ import java.util.Map;
 /**
  * Represents the semantics which apply to an existing connection when shared,
  * along with a human-readable name and unique identifier.
- *
- * @author Michael Jumper
  */
 public interface SharingProfile extends Identifiable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
index 49a5e667f..90167e4e2 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * A user of the Guacamole web application.
- *
- * @author Michael Jumper
  */
 public interface User extends Identifiable {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
index 0226ae14e..42f2a37ab 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.form.Form;
 /**
  * The context of an active user. The functions of this class enforce all
  * permissions and act only within the rights of the associated user.
- *
- * @author Michael Jumper
  */
 public interface UserContext {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
index 4f182a079..83b6fc28f 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.form.UsernameField;
 
 /**
  * Information which describes a set of valid credentials.
- *
- * @author Michael Jumper
  */
 public class CredentialsInfo {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
index e28815b09..6d973e192 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.GuacamoleUnauthorizedException;
  * A security-related exception thrown when access is denied to a user because
  * of a problem related to the provided credentials. Additional information
  * describing the form of valid credentials is provided.
- *
- * @author Michael Jumper
  */
 public class GuacamoleCredentialsException extends GuacamoleUnauthorizedException {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
index 177d90e87..06ae3ea5c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
@@ -25,8 +25,6 @@ package org.apache.guacamole.net.auth.credentials;
  * The validity or invalidity of the given credentials is not specified, and
  * more information is needed before a decision can be made. Additional
  * information describing the form of valid credentials is provided.
- *
- * @author Michael Jumper
  */
 public class GuacamoleInsufficientCredentialsException extends GuacamoleCredentialsException {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
index 720628d23..7986c5d1a 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth.credentials;
  * A security-related exception thrown when access is denied to a user because
  * the provided credentials are invalid. Additional information describing
  * the form of valid credentials is provided.
- *
- * @author Michael Jumper
  */
 public class GuacamoleInvalidCredentialsException extends GuacamoleCredentialsException {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/UserCredentials.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/UserCredentials.java
index e88706f1c..7895c71b0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/UserCredentials.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/UserCredentials.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.form.Field;
  * this object should describe a full set of parameter name/value pairs which
  * can be used to authenticate successfully, even if that success depends on
  * factors not described by this object.
- *
- * @author Michael Jumper
  */
 public class UserCredentials extends CredentialsInfo {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
index c96e26f89..2918be6b0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth.permission;
 /**
  * A permission which affects a specific object, rather than the system as a
  * whole.
- *
- * @author Michael Jumper
  */
 public class ObjectPermission implements Permission<ObjectPermission.Type> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
index c0c4dfb5f..3c3e910b5 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * A set of permissions which affect arbitrary objects, where each object has
  * an associated unique identifier.
- *
- * @author Michael Jumper
  */
 public interface ObjectPermissionSet extends PermissionSet<ObjectPermission> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
index aeaf5412b..73be29ead 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
@@ -24,9 +24,9 @@ package org.apache.guacamole.net.auth.permission;
  * A permission which affects a specific type of operation, where all available
  * operation types are defined by an enumeration.
  *
- * @author Michael Jumper
- * @param <Type> The enumeration of all available operation types that this
- *               permission can affect.
+ * @param <Type>
+ *     The enumeration of all available operation types that this permission
+ *     can affect.
  */
 public interface Permission<Type extends Enum> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
index b06255423..d559775e2 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
@@ -26,7 +26,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * An arbitrary set of permissions.
  *
- * @author Michael Jumper
  * @param <PermissionType>
  *     The type of permission stored within this PermissionSet.
  */
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
index 33779a543..b54ba907a 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.net.auth.permission;
 /**
  * A permission which affects the system as a whole, rather than an individual
  * object.
- *
- * @author Michael Jumper
  */
 public class SystemPermission implements Permission<SystemPermission.Type> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
index 5c758c65d..3f504db48 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.GuacamoleException;
 
 /**
  * A set of permissions which affects the system as a whole.
- *
- * @author Michael Jumper
  */
 public interface SystemPermissionSet extends PermissionSet<SystemPermission> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
index 06990e2b6..db7065173 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
@@ -40,8 +40,6 @@ import org.apache.guacamole.token.TokenFilter;
  *
  * The interface provided by SimpleAuthenticationProvider is similar to that of
  * the AuthenticationProvider interface of older Guacamole releases.
- *
- * @author Michael Jumper
  */
 public abstract class SimpleAuthenticationProvider
     implements AuthenticationProvider {
@@ -65,8 +63,6 @@ public abstract class SimpleAuthenticationProvider
     /**
      * AuthenticatedUser which contains its own predefined set of authorized
      * configurations.
-     *
-     * @author Michael Jumper
      */
     private class SimpleAuthenticatedUser extends AbstractAuthenticatedUser {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
index 633c4d8e2..fe25fcfac 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
@@ -38,8 +38,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely basic Connection implementation.
- *
- * @author Michael Jumper
  */
 public class SimpleConnection extends AbstractConnection {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
index c62818fbd..3f9c4c8a7 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.Connection;
  * An extremely simple read-only implementation of a Directory of
  * GuacamoleConfigurations which provides access to a pre-defined Map of
  * GuacamoleConfigurations.
- *
- * @author Michael Jumper
  */
 public class SimpleConnectionDirectory extends SimpleDirectory<Connection> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
index 0d1aef71b..3a7df28c2 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
@@ -35,8 +35,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
  * An extremely simple read-only implementation of a ConnectionGroup which
  * returns the connection and connection group identifiers it was constructed
  * with. Load balancing across this connection group is not allowed.
- * 
- * @author James Muehlner
  */
 public class SimpleConnectionGroup extends AbstractConnectionGroup {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
index 576e59862..a2597d4b2 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.ConnectionGroup;
  * An extremely simple read-only implementation of a Directory of
  * ConnectionGroup which provides which provides access to a pre-defined
  * Collection of ConnectionGroups.
- *
- * @author James Muehlner
  */
 public class SimpleConnectionGroupDirectory
     extends SimpleDirectory<ConnectionGroup> {
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
index b29caaca4..f18b3d6eb 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.ConnectionRecordSet;
 
 /**
  * An immutable and empty ConnectionRecordSet.
- *
- * @author Michael Jumper
  */
 public class SimpleConnectionRecordSet implements ConnectionRecordSet {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
index 89f09407d..03a14d960 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
@@ -34,7 +34,6 @@ import org.apache.guacamole.net.auth.Identifiable;
  * access to a pre-defined Map of arbitrary objects. Any changes to the Map
  * will affect the available contents of this SimpleDirectory.
  *
- * @author Michael Jumper
  * @param <ObjectType>
  *     The type of objects stored within this SimpleDirectory.
  */
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
index 5862752c2..7cf54bd2d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
@@ -31,8 +31,6 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 /**
  * A read-only implementation of ObjectPermissionSet which uses a backing Set
  * of Permissions to determine which permissions are present.
- *
- * @author Michael Jumper
  */
 public class SimpleObjectPermissionSet implements ObjectPermissionSet {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
index 79fcf3f36..ac82c838b 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 /**
  * A read-only implementation of SystemPermissionSet which uses a backing Set
  * of Permissions to determine which permissions are present.
- *
- * @author Michael Jumper
  */
 public class SimpleSystemPermissionSet implements SystemPermissionSet {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
index 0b7a86041..d6db92fa5 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * An extremely basic User implementation.
- *
- * @author Michael Jumper
  */
 public class SimpleUser extends AbstractUser {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
index 28bb6b1a6..c2d512be7 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
@@ -41,8 +41,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
  * An extremely simple UserContext implementation which provides access to
  * a defined and restricted set of GuacamoleConfigurations. Access to
  * querying or modifying either users or permissions is denied.
- *
- * @author Michael Jumper
  */
 public class SimpleUserContext implements UserContext {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
index 8b31e32d7..f9068d4e3 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.auth.User;
 /**
  * An extremely simple read-only implementation of a Directory of Users which
  * provides access to a single pre-defined User.
- *
- * @author Michael Jumper
  */
 public class SimpleUserDirectory extends SimpleDirectory<User> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
index 202962e73..9808e7047 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.auth.Credentials;
  * An event which is triggered whenever a user's credentials fail to be
  * authenticated. The credentials that failed to be authenticated are included
  * within this event, and can be retrieved using getCredentials().
- *
- * @author Michael Jumper
  */
 public class AuthenticationFailureEvent implements CredentialEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
index 74c323fbc..2e5ae3a17 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * An event which is triggered whenever a user's credentials pass
  * authentication. The credentials that passed authentication are included
  * within this event, and can be retrieved using getCredentials().
- * 
- * @author Michael Jumper
  */
 public class AuthenticationSuccessEvent implements UserEvent, CredentialEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
index e3428d062..ef902ee24 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.Credentials;
 /**
  * Abstract basis for events which may have associated user credentials when
  * triggered.
- *
- * @author Michael Jumper
  */
 public interface CredentialEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
index 9ddb3654f..ab453e87e 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * being closed can be accessed through getTunnel(), and the UserContext
  * associated with the request which is closing the tunnel can be retrieved
  * with getUserContext().
- *
- * @author Michael Jumper
  */
 public class TunnelCloseEvent implements UserEvent, CredentialEvent, TunnelEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
index 76e13fd5a..acf5e8922 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.UserContext;
  * being connected can be accessed through getTunnel(), and the UserContext
  * associated with the request which is connecting the tunnel can be retrieved
  * with getUserContext().
- *
- * @author Michael Jumper
  */
 public class TunnelConnectEvent implements UserEvent, CredentialEvent, TunnelEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
index a20012eed..f104e0390 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
@@ -23,8 +23,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * Abstract basis for events associated with tunnels.
- *
- * @author Michael Jumper
  */
 public interface TunnelEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
index 14a52924f..cfa4280e5 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.UserContext;
 /**
  * Abstract basis for events which may have an associated UserContext when
  * triggered.
- *
- * @author Michael Jumper
  */
 public interface UserEvent {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
index af9d3a584..5fcd27b67 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.net.event.AuthenticationFailureEvent;
  * A listener whose authenticationFailed() hook will fire immediately
  * after a user's authentication attempt fails. Note that this hook cannot
  * be used to cancel the authentication failure.
- *
- * @author Michael Jumper
  */
 public interface AuthenticationFailureListener  {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
index 8ac9fe339..7db072c36 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.event.AuthenticationSuccessEvent;
  * authentication attempt succeeds. If a user successfully authenticates,
  * the authenticationSucceeded() hook has the opportunity to cancel the
  * authentication and force it to fail.
- *
- * @author Michael Jumper
  */
 public interface AuthenticationSuccessListener {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
index effb8b5b1..784e4e932 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.event.TunnelCloseEvent;
 /**
  * A listener whose tunnelClosed() hook will fire immediately after an
  * existing tunnel is closed.
- *
- * @author Michael Jumper
  */
 public interface TunnelCloseListener {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
index bc415881c..da14fe277 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.event.TunnelConnectEvent;
 /**
  * A listener whose tunnelConnected() hook will fire immediately after a new
  * tunnel is connected.
- *
- * @author Michael Jumper
  */
 public interface TunnelConnectListener {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
index be8cac870..8fd51e702 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.GuacamoleServerException;
 /**
  * A GuacamoleProperty whose value is an boolean. Legal true values are "true",
  * or "false". Case does not matter.
- *
- * @author Michael Jumper
  */
 public abstract class BooleanGuacamoleProperty implements GuacamoleProperty<Boolean> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
index 03eb717f5..ec380defb 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a filename.
- *
- * @author Michael Jumper
  */
 public abstract class FileGuacamoleProperty implements GuacamoleProperty<File> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
index 598969e35..a26c1e041 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
  * Abstract representation of the Guacamole configuration directory.
  *
  * @deprecated
- * @author Michael Jumper
  */
 public class GuacamoleHome {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
index eb05ab1d1..a3eb7d15d 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
@@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory;
  * be read from the root of the classpath.
  *
  * @deprecated
- * @author Michael Jumper
  */
 public class GuacamoleProperties {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
index 5bd6df875..ed0c9f1a1 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
@@ -25,8 +25,8 @@ import org.apache.guacamole.GuacamoleException;
  * An abstract representation of a property in the guacamole.properties file,
  * which parses into a specific type.
  *
- * @author Michael Jumper
- * @param <Type> The type this GuacamoleProperty will parse into.
+ * @param <Type>
+ *     The type this GuacamoleProperty will parse into.
  */
 public interface GuacamoleProperty<Type> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
index 0b5862994..a9d3686c4 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an integer.
- *
- * @author Michael Jumper
  */
 public abstract class IntegerGuacamoleProperty implements GuacamoleProperty<Integer> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
index bca8538b7..5eb5d1f6a 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an long.
- *
- * @author James Muehlner
  */
 public abstract class LongGuacamoleProperty implements GuacamoleProperty<Long> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
index 61bd67f2d..0d3756ab1 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
@@ -23,8 +23,6 @@ import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a simple string.
- *
- * @author Michael Jumper
  */
 public abstract class StringGuacamoleProperty implements GuacamoleProperty<String> {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java b/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
index a5a8aa617..5b370d108 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.form.Form;
  * a protocol plugin for guacd. Each parameter is described with a Form, which
  * allows the parameters of a protocol to be exposed to the user as friendly
  * groupings of fields.
- *
- * @author Michael Jumper
  */
 public class ProtocolInfo {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
index 04058fe08..c13477c4b 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.net.auth.Credentials;
 /**
  * Utility class which provides access to standardized token names, as well as
  * facilities for generating those tokens from common objects.
- *
- * @author Michael Jumper
  */
 public class StandardTokens {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
index eaea70006..ab4362227 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
@@ -29,8 +29,6 @@ import java.util.regex.Pattern;
  * their corresponding values. Unknown tokens are not replaced. If TOKEN_NAME
  * is a valid token, the literal value "${TOKEN_NAME}" can be included by using
  * "$${TOKEN_NAME}".
- *
- * @author Michael Jumper
  */
 public class TokenFilter {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java b/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
index a74debd52..eb9bf5dec 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
@@ -29,8 +29,6 @@ import org.xml.sax.helpers.DefaultHandler;
  * A simple ContentHandler implementation which digests SAX document events and
  * produces simpler tag-level events, maintaining its own stack for the
  * convenience of the tag handlers.
- *
- * @author Mike Jumper
  */
 public class DocumentHandler extends DefaultHandler {
 
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java b/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
index ae7cbd905..ad0b8db57 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
@@ -25,8 +25,6 @@ import org.xml.sax.SAXException;
 /**
  * A simple element-level event handler for events triggered by the
  * SAX-driven DocumentHandler parser.
- *
- * @author Mike Jumper
  */
 public interface TagHandler {
 
diff --git a/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java b/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
index 5e35bf2bc..810651bff 100644
--- a/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
+++ b/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
@@ -26,8 +26,6 @@ import static org.junit.Assert.*;
 
 /**
  * Test which verifies the filtering functionality of TokenFilter.
- *
- * @author Michael Jumper
  */
 public class TokenFilterTest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java b/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java
index 2c149d99e..e79ba828d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.environment.Environment;
 
 /**
  * Guice module which binds the base Guacamole server environment.
- *
- * @author Michael Jumper
  */
 public class EnvironmentModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/GuacamoleServletContextListener.java b/guacamole/src/main/java/org/apache/guacamole/GuacamoleServletContextListener.java
index b36a0b6fe..72fe27313 100644
--- a/guacamole/src/main/java/org/apache/guacamole/GuacamoleServletContextListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/GuacamoleServletContextListener.java
@@ -38,8 +38,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A ServletContextListener to listen for initialization of the servlet context
  * in order to set up dependency injection.
- *
- * @author James Muehlner
  */
 public class GuacamoleServletContextListener extends GuiceServletContextListener {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java
index 0170e4d9a..de8145380 100644
--- a/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java
+++ b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java
@@ -35,8 +35,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Contains Guacamole-specific user information which is tied to the current
  * session, such as the UserContext and current clipboard state.
- *
- * @author Michael Jumper
  */
 public class GuacamoleSession {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/Authorization.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/Authorization.java
index d3e42bdc3..6ebc9dcfe 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/Authorization.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/Authorization.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
  * Mapping of username/password pair to configuration set. In addition to basic
  * storage of the username, password, and configurations, this class also
  * provides password validation functions.
- *
- * @author Mike Jumper
  */
 public class Authorization {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/AuthorizeTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/AuthorizeTagHandler.java
index 3ce97bbef..524b9b141 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/AuthorizeTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/AuthorizeTagHandler.java
@@ -26,8 +26,6 @@ import org.xml.sax.SAXException;
 
 /**
  * TagHandler for the "authorize" element.
- *
- * @author Mike Jumper
  */
 public class AuthorizeTagHandler implements TagHandler {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/ConnectionTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/ConnectionTagHandler.java
index cfbd3fc25..0793a9c5f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/ConnectionTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/ConnectionTagHandler.java
@@ -26,8 +26,6 @@ import org.xml.sax.SAXException;
 
 /**
  * TagHandler for the "connection" element.
- *
- * @author Mike Jumper
  */
 public class ConnectionTagHandler implements TagHandler {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
index e550742a4..27d34118e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
@@ -44,8 +44,6 @@ import org.xml.sax.helpers.XMLReaderFactory;
  * Authenticates users against a static list of username/password pairs.
  * Each username/password may be associated with multiple configurations.
  * This list is stored in an XML file which is reread if modified.
- *
- * @author Michael Jumper, Michal Kotas
  */
 public class FileAuthenticationProvider extends SimpleAuthenticationProvider {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/ParamTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/ParamTagHandler.java
index 251472af5..0c894c9e1 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/ParamTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/ParamTagHandler.java
@@ -26,8 +26,6 @@ import org.xml.sax.SAXException;
 
 /**
  * TagHandler for the "param" element.
- *
- * @author Mike Jumper
  */
 public class ParamTagHandler implements TagHandler {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/ProtocolTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/ProtocolTagHandler.java
index bff31b9be..ed58d402f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/ProtocolTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/ProtocolTagHandler.java
@@ -26,8 +26,6 @@ import org.xml.sax.SAXException;
 
 /**
  * TagHandler for the "protocol" element.
- *
- * @author Mike Jumper
  */
 public class ProtocolTagHandler implements TagHandler {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMapping.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMapping.java
index a36bed9dc..086eb1c27 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMapping.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMapping.java
@@ -24,8 +24,6 @@ import java.util.Map;
 
 /**
  * Mapping of all usernames to corresponding authorizations.
- *
- * @author Mike Jumper
  */
 public class UserMapping {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMappingTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMappingTagHandler.java
index b000487f4..804e2df08 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMappingTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/UserMappingTagHandler.java
@@ -25,8 +25,6 @@ import org.xml.sax.SAXException;
 
 /**
  * TagHandler for the "user-mapping" element.
- *
- * @author Mike Jumper
  */
 public class UserMappingTagHandler implements TagHandler {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java b/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java
index 704b7cca5..b1c671c0c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java
@@ -35,8 +35,6 @@ import org.slf4j.LoggerFactory;
  * Provides a safe wrapper around an AuthenticationProvider subclass, such that
  * authentication attempts can cleanly fail, and errors can be properly logged,
  * even if the AuthenticationProvider cannot be instantiated.
- *
- * @author Michael Jumper
  */
 public class AuthenticationProviderFacade implements AuthenticationProvider {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java b/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java
index f00926fc1..215c3c00c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * A ClassLoader implementation which finds classes within .jar files within a
  * given directory.
- *
- * @author Michael Jumper
  */
 public class DirectoryClassLoader extends URLClassLoader {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java b/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java
index b6e58e28c..3183fa21c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java
@@ -46,8 +46,6 @@ import org.apache.guacamole.resource.Resource;
 /**
  * A Guacamole extension, which may provide custom authentication, static
  * files, theming/branding, etc.
- *
- * @author Michael Jumper
  */
 public class Extension {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java
index ce49d459b..9b9bd9bee 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java
@@ -26,8 +26,6 @@ import org.codehaus.jackson.annotate.JsonProperty;
 /**
  * Java representation of the JSON manifest contained within every Guacamole
  * extension, identifying an extension and describing its contents.
- *
- * @author Michael Jumper
  */
 public class ExtensionManifest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index d0e646348..6388e7bc9 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -44,8 +44,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A Guice Module which loads all extensions within the
  * GUACAMOLE_HOME/extensions directory, if any.
- *
- * @author Michael Jumper
  */
 public class ExtensionModule extends ServletModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java b/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java
index 6fbb22b8a..d4e1d37ee 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java
@@ -45,8 +45,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Service which provides access to all built-in languages as resources, and
  * allows other resources to be added or overlaid against existing resources.
- *
- * @author Michael Jumper
  */
 public class LanguageResourceService {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java b/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java
index 422c7781f..03791ef59 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.resource.Resource;
 /**
  * Service which provides access to all HTML patches as resources, and allows
  * other patch resources to be added.
- *
- * @author Michael Jumper
  */
 public class PatchResourceService {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java b/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java
index c831dada4..accc4a9dd 100644
--- a/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java
@@ -31,8 +31,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Initializes the logging subsystem.
- *
- * @author Michael Jumper
  */
 public class LogModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java b/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java
index c34dea609..147818486 100644
--- a/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java
+++ b/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.properties.GuacamoleProperty;
  * compatibility with the behavior of Java properties in general, only
  * whitespace at the beginning of each value is ignored; trailing whitespace
  * becomes part of the value.
- *
- * @author Michael Jumper
  */
 public abstract class StringSetProperty implements GuacamoleProperty<Set<String>> {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java
index d4fdc520b..194dc3e0c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java
@@ -23,8 +23,6 @@ package org.apache.guacamole.resource;
  * Base abstract resource implementation which provides an associated mimetype,
  * and modification time. Classes which extend AbstractResource must provide
  * their own InputStream, however.
- *
- * @author Michael Jumper
  */
 public abstract class AbstractResource implements Resource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java
index e7a290909..712285b42 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java
@@ -24,8 +24,6 @@ import java.io.InputStream;
 
 /**
  * A resource which contains a defined byte array.
- *
- * @author Michael Jumper
  */
 public class ByteArrayResource extends AbstractResource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java
index 7e5d4cb12..bd5352263 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java
@@ -24,8 +24,6 @@ import java.io.InputStream;
 /**
  * A resource which is located within the classpath of an arbitrary
  * ClassLoader.
- *
- * @author Michael Jumper
  */
 public class ClassPathResource extends AbstractResource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java b/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java
index b260fc24f..364348350 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java
@@ -24,8 +24,6 @@ import java.io.InputStream;
 /**
  * An arbitrary resource that can be served to a user via HTTP. Resources are
  * anonymous but have a defined mimetype and corresponding input stream.
- *
- * @author Michael Jumper
  */
 public interface Resource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java b/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java
index e6be9993f..a6cf97357 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
  * method is correctly supported, and HTTP 304 ("Not Modified") responses will
  * be properly returned for GET requests depending on the last time the
  * resource was modified.
- *
- * @author Michael Jumper
  */
 public class ResourceServlet extends HttpServlet {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java
index b639e01cd..6f0a7d61b 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java
@@ -27,8 +27,6 @@ import java.util.Iterator;
 
 /**
  * A resource which is the logical concatenation of other resources.
- *
- * @author Michael Jumper
  */
 public class SequenceResource extends AbstractResource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java
index 17f6e6686..bf38521a5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java
@@ -25,8 +25,6 @@ import javax.servlet.ServletContext;
 /**
  * A resource which is located within the classpath associated with another
  * class.
- *
- * @author Michael Jumper
  */
 public class WebApplicationResource extends AbstractResource {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java
index 2bec055ba..98a74339f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java
@@ -34,9 +34,6 @@ import org.apache.guacamole.tunnel.GuacamoleStreamException;
 
 /**
  * Describes an error that occurred within a REST endpoint.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class APIError {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java
index 0e1a4f54a..01103b0ed 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java
@@ -29,9 +29,6 @@ import org.apache.guacamole.GuacamoleException;
  * within the context of the REST API, an appropriate HTTP status code will be
  * set for the failing response, and the details of the error will be exposed in
  * the body of the response as an APIError structure.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class APIException extends WebApplicationException {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java
index 6d275822f..28ff788a5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java
@@ -22,9 +22,9 @@ package org.apache.guacamole.rest;
 /**
  * An object for representing the body of a HTTP PATCH method.
  * See https://tools.ietf.org/html/rfc6902
- * 
- * @author James Muehlner
- * @param <T> The type of object being patched.
+ *
+ * @param <T>
+ *     The type of object being patched.
  */
 public class APIPatch<T> {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
index 9044b24ad..e3a2df47f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
@@ -31,8 +31,6 @@ import javax.ws.rs.core.MultivaluedMap;
 /**
  * Wrapper for HttpServletRequest which uses a given MultivaluedMap to provide
  * the values of all request parameters.
- * 
- * @author Michael Jumper
  */
 public class APIRequest extends HttpServletRequestWrapper {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java b/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java
index 69c690bdf..171719eed 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java
@@ -28,10 +28,8 @@ import javax.ws.rs.HttpMethod;
 
 /**
  * An annotation for using the HTTP PATCH method in the REST endpoints.
- * 
- * @author James Muehlner
  */
 @Target({ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME) 
 @HttpMethod("PATCH") 
-public @interface PATCH {} 
\ No newline at end of file
+public @interface PATCH {} 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java
index 8d6839f02..6f1ab371f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java
@@ -43,9 +43,6 @@ import org.slf4j.LoggerFactory;
  * interface. The various types of GuacamoleExceptions are automatically
  * translated into appropriate HTTP responses, including JSON describing the
  * error that occurred.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class RESTExceptionWrapper implements MethodInterceptor {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java
index 623932f9f..875f4161c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.GuacamoleException;
  * annotation like <code>@GET</code> or <code>@POST</code>. Any method which
  * throws GuacamoleException and is annotated with an annotation that is
  * annotated with <code>@HttpMethod</code> will match.
- *
- * @author Michael Jumper
  */
 public class RESTMethodMatcher extends AbstractMatcher<Method> {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
index dfea0e772..95be583f8 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
@@ -48,9 +48,6 @@ import org.webjars.servlet.WebjarsServlet;
 /**
  * A Guice Module to set up the servlet mappings and authentication-specific
  * dependency injection for the Guacamole REST API.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class RESTServiceModule extends ServletModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java
index d8c6680da..0041a03cb 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.auth.ActiveConnection;
 /**
  * Information related to active connections which may be exposed through the
  * REST endpoints.
- * 
- * @author Michael Jumper
  */
 public class APIActiveConnection {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIUserCredentials.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIUserCredentials.java
index eb87bafcb..b517101c1 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIUserCredentials.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIUserCredentials.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.net.auth.credentials.UserCredentials;
  * The object returned by REST API calls to define a full set of valid
  * credentials, including field definitions and corresponding expected
  * values.
- *
- * @author Michael Jumper
  */
 public class APIUserCredentials {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionDirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionDirectoryResource.java
index a19b5dcb2..5665ccf18 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionDirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionDirectoryResource.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * A REST resource which abstracts the operations available on a Directory of
  * ActiveConnections.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionModule.java
index c5418c21d..6b1094d05 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionModule.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * Guice Module which configures injections required for handling
  * ActiveConnection resources via the REST API.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionObjectTranslator.java
index f0f9ed35a..d59f8c52c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionObjectTranslator.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
  * Translator which converts between ActiveConnection objects and
  * APIActiveConnection objects. As ActiveConnection objects are read-only, only
  * toExternalObject() is implemented here.
- *
- * @author Michael Jumper
  */
 public class ActiveConnectionObjectTranslator
         implements DirectoryObjectTranslator<ActiveConnection, APIActiveConnection> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionResource.java
index 736cbf8b9..e72e674a3 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionResource.java
@@ -41,8 +41,6 @@ import org.apache.guacamole.rest.directory.DirectoryResourceFactory;
 /**
  * A REST resource which abstracts the operations available on an existing
  * ActiveConnection.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java
index d5e4920e3..ee287012d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.rest.auth;
 
 /**
  * A simple object to represent an auth token/username pair in the API.
- * 
- * @author James Muehlner
  */
 public class APIAuthenticationResponse {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java
index c09e38b85..2f5082342 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java
@@ -25,9 +25,6 @@ import java.util.List;
 /**
  * A simple object which describes the result of an authentication operation,
  * including the resulting token.
- *
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class APIAuthenticationResult {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java
index 194b1e74c..22f990272 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java
@@ -21,8 +21,6 @@ package org.apache.guacamole.rest.auth;
 
 /**
  * Generates an auth token for an authenticated user.
- * 
- * @author James Muehlner
  */
 public interface AuthTokenGenerator {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
index ac94e9fac..31abee5f5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
@@ -41,9 +41,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A service for performing authentication checks in REST endpoints.
- * 
- * @author James Muehlner
- * @author Michael Jumper
  */
 public class AuthenticationService {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
index 78cfa1964..ced18f6f4 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A HashMap-based implementation of the TokenSessionMap with support for
  * session timeouts.
- *
- * @author James Muehlner
  */
 public class HashTokenSessionMap implements TokenSessionMap {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java
index dc94b44b5..ac09ff0c1 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java
@@ -24,8 +24,6 @@ import javax.xml.bind.DatatypeConverter;
 
 /**
  * An implementation of the AuthTokenGenerator based around SecureRandom.
- * 
- * @author James Muehlner
  */
 public class SecureRandomAuthTokenGenerator implements AuthTokenGenerator {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
index 2ba6459d5..6366d287c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
@@ -46,9 +46,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A service for managing auth tokens via the Guacamole REST API.
- * 
- * @author James Muehlner
- * @author Michael Jumper
  */
 @Path("/tokens")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java
index 83c8174b7..317523926 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleSession;
 /**
  * Represents a mapping of auth token to Guacamole session for the REST 
  * authentication system.
- * 
- * @author James Muehlner
  */
 public interface TokenSessionMap {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
index cd0441331..8e6a385f4 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.rest.sharingprofile.APISharingProfile;
 
 /**
  * A simple connection to expose through the REST endpoints.
- * 
- * @author James Muehlner
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java
index 1153d7231..e06e338db 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java
@@ -33,8 +33,6 @@ import org.apache.guacamole.protocol.GuacamoleConfiguration;
 /**
  * A wrapper to make an APIConnection look like a Connection. Useful where a
  * org.apache.guacamole.net.auth.Connection is required.
- * 
- * @author James Muehlner
  */
 public class APIConnectionWrapper implements Connection {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionDirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionDirectoryResource.java
index 63bc87940..ce3507136 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionDirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionDirectoryResource.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * A REST resource which abstracts the operations available on a Directory of
  * Connections.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionModule.java
index 228e53c3a..333c34ee7 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionModule.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * Guice Module which configures injections required for handling Connection
  * resources via the REST API.
- *
- * @author Michael Jumper
  */
 public class ConnectionModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionObjectTranslator.java
index de6253f13..112c71aa2 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionObjectTranslator.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 /**
  * Translator which converts between Connection objects and APIConnection
  * objects.
- *
- * @author Michael Jumper
  */
 public class ConnectionObjectTranslator
         implements DirectoryObjectTranslator<Connection, APIConnection> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
index 4d257701d..b1ddcfc47 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
@@ -54,8 +54,6 @@ import org.apache.guacamole.rest.sharingprofile.APISharingProfile;
 /**
  * A REST resource which abstracts the operations available on an existing
  * Connection.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java
index 31c6e414f..b9597d94f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.rest.connection.APIConnection;
 
 /**
  * A simple connection group to expose through the REST endpoints.
- * 
- * @author James Muehlner
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java
index f2033ab3e..625b009d6 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.protocol.GuacamoleClientInformation;
 /**
  * A wrapper to make an APIConnection look like a ConnectionGroup.
  * Useful where a org.apache.guacamole.net.auth.ConnectionGroup is required.
- * 
- * @author James Muehlner
  */
 public class APIConnectionGroupWrapper implements ConnectionGroup {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupDirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupDirectoryResource.java
index 2c32e21d9..06da559f4 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupDirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupDirectoryResource.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * A REST resource which abstracts the operations available on a Directory of
  * ConnectionGroups.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupModule.java
index df69919ea..d73817aab 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupModule.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * Guice Module which configures injections required for handling
  * ConnectionGroup resources via the REST API.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupObjectTranslator.java
index efd5cb95b..18de4dc0e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupObjectTranslator.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 /**
  * Translator which converts between ConnectionGroup objects and
  * APIConnectionGroup objects.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupObjectTranslator
         implements DirectoryObjectTranslator<ConnectionGroup, APIConnectionGroup> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupResource.java
index c0b80c44b..9e7c9866a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupResource.java
@@ -39,8 +39,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 /**
  * A REST resource which abstracts the operations available on an existing
  * ConnectionGroup.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java
index 2541fa2db..a85096667 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java
@@ -42,8 +42,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides access to the entire tree of connection groups, their
  * connections, and any associated sharing profiles.
- *
- * @author Michael Jumper
  */
 public class ConnectionGroupTree {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResource.java
index 463a1a017..b5277b3f9 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResource.java
@@ -35,7 +35,6 @@ import org.apache.guacamole.net.auth.Identifiable;
  * Guacamole object that is contained within a Directory, such as modification,
  * deletion, or individual retrieval.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The type of object that this DirectoryObjectResource represents. To
  *     avoid coupling the REST API too tightly to the extension API, these
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectTranslator.java
index bac47957b..b8355bf8c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectTranslator.java
@@ -26,7 +26,6 @@ import org.apache.guacamole.net.auth.Identifiable;
  * Provides bidirectional conversion between REST-specific objects and the
  * internal objects defined by the Guacamole extension API.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The type of object converted by this DirectoryObjectTranslator which is
  *     not necessarily intended for use in interchange.
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
index 5f1e950cd..2af0e26df 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
@@ -53,7 +53,6 @@ import org.apache.guacamole.rest.PATCH;
  * number of child DirectoryObjectResources, which are created with the factory
  * provided at the time of this object's construction.
  *
- * @author Michael Jumper
  * @param <InternalType>
  *     The type of object contained within the Directory that this
  *     DirectoryResource exposes. To avoid coupling the REST API too tightly to
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryView.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryView.java
index aee18f346..3acf29ede 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryView.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryView.java
@@ -33,7 +33,6 @@ import org.apache.guacamole.net.auth.Identifiable;
  * determined by the set of identifiers provided when the DirectoryView is
  * created.
  *
- * @author Michael Jumper
  * @param <ObjectType>
  *     The type of objects accessible through this DirectoryView.
  */
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
index 36e639cf3..97c99a04d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A connection record which may be exposed through the REST endpoints.
- *
- * @author Michael Jumper
  */
 public class APIConnectionRecord {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java
index a881f60eb..2a4c81878 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.rest.APIException;
 /**
  * A sort predicate which species the property to use when sorting connection
  * records, along with the sort order.
- *
- * @author Michael Jumper
  */
 public class APIConnectionRecordSortPredicate {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
index d71d44555..49695c4d3 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
@@ -35,8 +35,6 @@ import org.apache.guacamole.net.auth.UserContext;
 /**
  * A REST resource for retrieving and managing the history records of Guacamole
  * objects.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java
index cb312dc31..3f5f32cff 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.extension.LanguageResourceService;
 
 /**
  * A REST Service for handling the listing of languages.
- * 
- * @author James Muehlner
  */
 @Path("/languages")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java
index 3c7ecca03..e8e5f003d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.resource.Resource;
 
 /**
  * A REST Service for handling the listing of HTML patches.
- *
- * @author Michael Jumper
  */
 @Path("/patches")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetPatch.java b/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetPatch.java
index b08d2ba3f..c159e3245 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetPatch.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetPatch.java
@@ -29,7 +29,6 @@ import org.apache.guacamole.net.auth.permission.PermissionSet;
  * A set of changes to be applied to a PermissionSet, describing the set of
  * permissions being added and removed.
  * 
- * @author Michael Jumper
  * @param <PermissionType>
  *     The type of permissions being added and removed.
  */
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetResource.java
index 9dd38f758..20b1b6715 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/permission/PermissionSetResource.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.rest.PATCH;
 /**
  * A REST resource which abstracts the operations available on the permissions
  * granted to an existing User.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
index ed443b15c..326183529 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.protocols.ProtocolInfo;
 /**
  * A REST resource which provides access to descriptions of the properties,
  * attributes, etc. of objects within a particular UserContext.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionRESTService.java
index e8c4d7509..6a980f1cd 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionRESTService.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.auth.AuthenticationService;
 /**
  * A REST service which exposes all data associated with Guacamole users'
  * sessions.
- *
- * @author Michael Jumper
  */
 @Path("/session")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java
index 93f00a5e6..568df4f2b 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.rest.tunnel.TunnelCollectionResourceFactory;
 /**
  * A REST resource which exposes all data associated with a Guacamole user's
  * session via the underlying UserContexts.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResourceFactory.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResourceFactory.java
index eaa839451..a166b37b0 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResourceFactory.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResourceFactory.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleSession;
 /**
  * Factory which creates resources that expose the contents of a given
  * GuacamoleSession.
- *
- * @author Michael Jumper
  */
 public interface SessionResourceFactory {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResource.java
index 39be48950..29b443f16 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResource.java
@@ -47,8 +47,6 @@ import org.apache.guacamole.rest.user.APIUser;
 
 /**
  * A REST resource which exposes the contents of a particular UserContext.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResourceFactory.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResourceFactory.java
index 04e60eaa3..5eea3edf5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResourceFactory.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/UserContextResourceFactory.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.net.auth.UserContext;
 /**
  * Factory which creates resources that expose the contents of a given
  * UserContext.
- *
- * @author Michael Jumper
  */
 public interface UserContextResourceFactory {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfile.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfile.java
index 822bcee7f..fe4db5097 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfile.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfile.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.net.auth.SharingProfile;
 
 /**
  * The external representation used by the REST API for sharing profiles.
- * 
- * @author Michael Jumper
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class APISharingProfile {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfileWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfileWrapper.java
index effb1d43a..8bca15779 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfileWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfileWrapper.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.net.auth.SharingProfile;
  * Changes to the underlying APISharingProfile are reflected immediately in the
  * values exposed by the SharingProfile interface, and changes made through the
  * SharingProfile interface immediately affect the underlying APISharingProfile.
- *
- * @author Michael Jumper
  */
 public class APISharingProfileWrapper implements SharingProfile {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileDirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileDirectoryResource.java
index 3371fdb16..cdd9f2a83 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileDirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileDirectoryResource.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * A REST resource which abstracts the operations available on a Directory of
  * SharingProfiles.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileModule.java
index dabec70f5..682259332 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileModule.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.directory.DirectoryResourceFactory;
 /**
  * Guice Module which configures injections required for handling SharingProfile
  * resources via the REST API.
- *
- * @author Michael Jumper
  */
 public class SharingProfileModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileObjectTranslator.java
index 42dbc1cad..2cbe1bf23 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileObjectTranslator.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 /**
  * Translator which converts between SharingProfile objects and
  * APISharingProfile objects.
- *
- * @author Michael Jumper
  */
 public class SharingProfileObjectTranslator
         implements DirectoryObjectTranslator<SharingProfile, APISharingProfile> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java
index debf804b2..1f18d0f94 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java
@@ -43,8 +43,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 /**
  * A REST resource which abstracts the operations available on an existing
  * SharingProfile.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/StreamResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/StreamResource.java
index 1dc93b759..70b2ff026 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/StreamResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/StreamResource.java
@@ -36,8 +36,6 @@ import org.apache.guacamole.tunnel.StreamInterceptingTunnel;
 /**
  * A REST resource providing access to a Guacamole protocol-level stream
  * within a tunnel.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
index 600254f28..d4fac136b 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
@@ -37,8 +37,6 @@ import org.apache.guacamole.tunnel.UserTunnel;
 
 /**
  * A REST resource which exposes the active tunnels of a Guacamole session.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResourceFactory.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResourceFactory.java
index 350e1a650..49954bb5c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResourceFactory.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResourceFactory.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.GuacamoleSession;
 /**
  * Factory which creates resources that expose the collection of tunnels
  * contained within a given GuacamoleSession.
- *
- * @author Michael Jumper
  */
 public interface TunnelCollectionResourceFactory {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResource.java
index f435365fd..53973394a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResource.java
@@ -41,8 +41,6 @@ import org.apache.guacamole.tunnel.UserTunnel;
 /**
  * A REST resource which abstracts the operations available for an individual
  * tunnel.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResourceFactory.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResourceFactory.java
index cafd64e2c..2deacf88a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResourceFactory.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResourceFactory.java
@@ -24,8 +24,6 @@ import org.apache.guacamole.tunnel.UserTunnel;
 /**
  * Factory which creates resources that expose the contents of a given
  * tunnel.
- *
- * @author Michael Jumper
  */
 public interface TunnelResourceFactory {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
index ac0e72513..96e223040 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.net.auth.User;
 
 /**
  * A simple User to expose through the REST endpoints.
- * 
- * @author James Muehlner
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java
index f3ae2696f..d888823b3 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java
@@ -20,8 +20,6 @@ package org.apache.guacamole.rest.user;
 
 /**
  * All the information necessary for the password update operation on a user.
- * 
- * @author James Muehlner
  */
 public class APIUserPasswordUpdate {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java
index cef6aec88..35769faa7 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java
@@ -31,8 +31,6 @@ import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
  * org.apache.guacamole.net.auth.User is required. As a simple wrapper for
  * APIUser, access to permissions is not provided. Any attempt to access or
  * manipulate permissions on an APIUserWrapper will result in an exception.
- * 
- * @author James Muehlner
  */
 public class APIUserWrapper implements User {
     
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserDirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserDirectoryResource.java
index 0aca4090a..5aeb4e45c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserDirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserDirectoryResource.java
@@ -34,8 +34,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * A REST resource which abstracts the operations available on a Directory of
  * Users.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserModule.java
index 5fa0774a2..35af01ce5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserModule.java
@@ -32,8 +32,6 @@ import org.apache.guacamole.rest.directory.DirectoryResource;
 /**
  * Guice Module which configures injections required for handling User resources
  * via the REST API.
- *
- * @author Michael Jumper
  */
 public class UserModule extends AbstractModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserObjectTranslator.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserObjectTranslator.java
index 5098c35fc..35bce6681 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserObjectTranslator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserObjectTranslator.java
@@ -25,8 +25,6 @@ import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
 
 /**
  * Translator which converts between User objects and APIUser objects.
- *
- * @author Michael Jumper
  */
 public class UserObjectTranslator
         implements DirectoryObjectTranslator<User, APIUser> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
index a0ca3ecbd..3f142ff08 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
@@ -43,8 +43,6 @@ import org.apache.guacamole.rest.permission.PermissionSetResource;
 /**
  * A REST resource which abstracts the operations available on an existing
  * User.
- *
- * @author Michael Jumper
  */
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/GuacamoleStreamException.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/GuacamoleStreamException.java
index c2b19c8b8..b6069d340 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/GuacamoleStreamException.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/GuacamoleStreamException.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * A generic exception thrown when an intercepted Guacamole stream has closed
  * with an error condition. Guacamole streams report errors using the "ack"
  * instruction, which provides a status code and human-readable message.
- *
- * @author Michael Jumper
  */
 public class GuacamoleStreamException extends GuacamoleServerException {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStream.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStream.java
index 021411f0e..01f5e418a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStream.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStream.java
@@ -28,7 +28,6 @@ import org.apache.guacamole.protocol.GuacamoleStatus;
  * stream-type object which will produce or consume the data sent over the
  * intercepted Guacamole stream.
  *
- * @author Michael Jumper
  * @param <T>
  *     The type of object which will produce or consume the data sent over the
  *     intercepted Guacamole stream. Usually, this will be either InputStream
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStreamMap.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStreamMap.java
index 344bc36a1..6ddfdf976 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStreamMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/InterceptedStreamMap.java
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Map-like storage for intercepted Guacamole streams.
  *
- * @author Michael Jumper
  * @param <T>
  *     The type of object which will produce or consume the data sent over the
  *     intercepted Guacamole stream. Usually, this will be either InputStream
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/OutputStreamInterceptingFilter.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/OutputStreamInterceptingFilter.java
index f01690658..85ae02c4a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/OutputStreamInterceptingFilter.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/OutputStreamInterceptingFilter.java
@@ -35,8 +35,6 @@ import org.slf4j.LoggerFactory;
  * automatically writing to or closing the stream given with
  * interceptStream(). The required "ack" responses to received blobs are
  * sent automatically.
- *
- * @author Michael Jumper
  */
 public class OutputStreamInterceptingFilter
         extends StreamInterceptingFilter<OutputStream> {
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/StreamInterceptingTunnel.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/StreamInterceptingTunnel.java
index dc14d4833..d4ba00edd 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/StreamInterceptingTunnel.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/StreamInterceptingTunnel.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
  * contents of in-progress streams, rerouting blobs to a provided OutputStream
  * or from a provided InputStream. Interception of streams is requested on a per
  * stream basis and lasts only for the duration of that stream.
- *
- * @author Michael Jumper
  */
 public class StreamInterceptingTunnel extends DelegatingGuacamoleTunnel {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelLoader.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelLoader.java
index b91527f5c..e8701b669 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelLoader.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelLoader.java
@@ -25,8 +25,6 @@ import com.google.inject.Module;
  * Generic means of loading a tunnel without adding explicit dependencies within
  * the main ServletModule, as not all servlet containers may have the classes
  * required by all tunnel implementations.
- *
- * @author Michael Jumper
  */
 public interface TunnelLoader extends Module {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
index fdc218cfe..218b00720 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
@@ -27,8 +27,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Module which loads tunnel implementations.
- *
- * @author Michael Jumper
  */
 public class TunnelModule extends ServletModule {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequest.java
index 2c97f0477..8c23dabad 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequest.java
@@ -28,8 +28,6 @@ import org.apache.guacamole.GuacamoleException;
 /**
  * A request object which provides only the functions absolutely required to
  * retrieve and connect to a tunnel.
- *
- * @author Michael Jumper
  */
 public abstract class TunnelRequest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
index 5bcab4cef..628386916 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
@@ -42,9 +42,6 @@ import org.slf4j.LoggerFactory;
  * of this utility is specific to the form of request used by the upstream
  * Guacamole web application, and is not necessarily useful to applications
  * that use purely the Guacamole API.
- *
- * @author Michael Jumper
- * @author Vasily Loginov
  */
 @Singleton
 public class TunnelRequestService {
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/UserTunnel.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/UserTunnel.java
index 2632a4c53..3a100b904 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/UserTunnel.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/UserTunnel.java
@@ -30,8 +30,6 @@ import org.apache.guacamole.net.auth.UserContext;
 /**
  * Tunnel implementation which associates a given tunnel with the UserContext of
  * the user that created it.
- *
- * @author Michael Jumper
  */
 public class UserTunnel extends StreamInterceptingTunnel {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/http/HTTPTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/http/HTTPTunnelRequest.java
index 2b88af932..48de10b7a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/http/HTTPTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/http/HTTPTunnelRequest.java
@@ -29,8 +29,6 @@ import org.apache.guacamole.tunnel.TunnelRequest;
 
 /**
  * HTTP-specific implementation of TunnelRequest.
- *
- * @author Michael Jumper
  */
 public class HTTPTunnelRequest extends TunnelRequest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/http/RestrictedGuacamoleHTTPTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/http/RestrictedGuacamoleHTTPTunnelServlet.java
index 7aa1b09f3..4a7ef78cc 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/http/RestrictedGuacamoleHTTPTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/http/RestrictedGuacamoleHTTPTunnelServlet.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Connects users to a tunnel associated with the authorized connection
  * having the given ID.
- *
- * @author Michael Jumper
  */
 @Singleton
 public class RestrictedGuacamoleHTTPTunnelServlet extends GuacamoleHTTPTunnelServlet {
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelModule.java
index 1005f0169..423b8155d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelModule.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Loads the JSR-356 WebSocket tunnel implementation.
- * 
- * @author Michael Jumper
  */
 public class WebSocketTunnelModule extends ServletModule implements TunnelLoader {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelRequest.java
index acebe0572..5f0ad0264 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/WebSocketTunnelRequest.java
@@ -26,8 +26,6 @@ import org.apache.guacamole.tunnel.TunnelRequest;
 
 /**
  * WebSocket-specific implementation of TunnelRequest.
- *
- * @author Michael Jumper
  */
 public class WebSocketTunnelRequest extends TunnelRequest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
index 8f7e39e6d..976964625 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
@@ -39,8 +39,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet.
- *
- * @author Michael Jumper
  */
 public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
index 4cbc2b09c..3dd7bf185 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Loads the Jetty 8 WebSocket tunnel implementation.
- * 
- * @author Michael Jumper
  */
 public class WebSocketTunnelModule extends ServletModule implements TunnelLoader {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
index 3224f8975..5375d75a6 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
@@ -37,8 +37,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * WebSocket listener implementation which provides a Guacamole tunnel
- * 
- * @author Michael Jumper
  */
 public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListener {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketCreator.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketCreator.java
index c393e7181..97489f549 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketCreator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketCreator.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.tunnel.TunnelRequestService;
 /**
  * WebSocketCreator which selects the appropriate WebSocketListener
  * implementation if the "guacamole" subprotocol is in use.
- * 
- * @author Michael Jumper
  */
 public class RestrictedGuacamoleWebSocketCreator implements WebSocketCreator {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelListener.java
index a5f450c27..48fad55c4 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelListener.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.tunnel.TunnelRequestService;
 /**
  * WebSocket listener implementation which properly parses connection IDs
  * included in the connection request.
- * 
- * @author Michael Jumper
  */
 public class RestrictedGuacamoleWebSocketTunnelListener extends GuacamoleWebSocketTunnelListener {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelServlet.java
index 6dcc85836..9497e5460 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/RestrictedGuacamoleWebSocketTunnelServlet.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.tunnel.TunnelRequestService;
 
 /**
  * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet.
- *
- * @author Michael Jumper
  */
 @Singleton
 public class RestrictedGuacamoleWebSocketTunnelServlet extends WebSocketServlet {
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
index c98d1cb70..536667286 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Loads the Jetty 9 WebSocket tunnel implementation.
- * 
- * @author Michael Jumper
  */
 public class WebSocketTunnelModule extends ServletModule implements TunnelLoader {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelRequest.java
index adbc8d014..2875bc9d7 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelRequest.java
@@ -27,8 +27,6 @@ import org.apache.guacamole.tunnel.TunnelRequest;
 
 /**
  * Jetty 9 WebSocket-specific implementation of TunnelRequest.
- *
- * @author Michael Jumper
  */
 public class WebSocketTunnelRequest extends TunnelRequest {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
index 498167570..986650eac 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
@@ -44,8 +44,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet.
- *
- * @author Michael Jumper
  */
 public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
 
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
index 341907614..5529fab59 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Loads the Jetty 9 WebSocket tunnel implementation.
- * 
- * @author Michael Jumper
  */
 public class WebSocketTunnelModule extends ServletModule implements TunnelLoader {