diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
index 52bcaf61b..94585a38b 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
@@ -203,143 +203,6 @@ public class ClientDetailsEntity implements ClientDetails {
 		
 	}
 
-	public static ClientDetailsEntityBuilder makeBuilder() {
-    	return new ClientDetailsEntityBuilder();
-    }
-
-	//TODO or FIXME: This builder is currently unused. If we want to keep it, it needs
-	//to be updated with the current fieldset.
-	public static class ClientDetailsEntityBuilder {
-		private ClientDetailsEntity instance;
-		
-		private ClientDetailsEntityBuilder() {
-			instance = new ClientDetailsEntity();
-		}
-
-		/**
-         * @param clientDescription
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setClientDescription(java.lang.String)
-         */
-        public ClientDetailsEntityBuilder setClientDescription(String clientDescription) {
-	        instance.setClientDescription(clientDescription);
-			return this;
-        }
-		
-        /**
-         * @param allowRefresh
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setAllowRefresh(boolean)
-         */
-        public ClientDetailsEntityBuilder setAllowRefresh(boolean allowRefresh) {
-	        instance.setAllowRefresh(allowRefresh);
-			return this;
-        }
-        
-        /**
-         * @param allow
-         * @see 
-         */
-        public ClientDetailsEntityBuilder setAllowMultipleAccessTokens(boolean allow) {
-        	instance.setAllowMultipleAccessTokens(allow);
-        	return this;
-        }
-        
-        
-        
-		/**
-         * @param clientId
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setClientId(java.lang.String)
-         */
-        public ClientDetailsEntityBuilder setClientId(String clientId) {
-	        instance.setClientId(clientId);
-			return this;
-        }
-
-		/**
-         * @param clientSecret
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setClientSecret(java.lang.String)
-         */
-        public ClientDetailsEntityBuilder setClientSecret(String clientSecret) {
-	        instance.setClientSecret(clientSecret);
-			return this;
-        }
-
-		/**
-         * @param scope
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setScope(java.util.List)
-         */
-        public ClientDetailsEntityBuilder setScope(Set<String> scope) {
-	        instance.setScope(scope);
-			return this;
-        }
-
-		/**
-         * @param authorizedGrantTypes
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setAuthorizedGrantTypes(java.util.List)
-         */
-        public ClientDetailsEntityBuilder setAuthorizedGrantTypes(Set<String> authorizedGrantTypes) {
-	        instance.setAuthorizedGrantTypes(authorizedGrantTypes);
-			return this;
-        }
-
-		/**
-         * @param authorities
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setAuthorities(java.util.List)
-         */
-        public ClientDetailsEntityBuilder setAuthorities(Set<GrantedAuthority> authorities) {
-	        instance.setAuthorities(authorities);
-			return this;
-        }
-
-		
-
-		
-
-		/**
-         * @param accessTokenTimeout
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setAccessTokenTimeout(java.lang.Long)
-         */
-        public ClientDetailsEntityBuilder setAccessValiditySeconds(int accessTokenValiditySeconds) {
-	        instance.setAccessTokenValiditySeconds(accessTokenValiditySeconds);
-			return this;
-        }
-
-		/**
-         * @param refreshTokenTimeout
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setRefreshTokenTimeout(java.lang.Long)
-         */
-        public ClientDetailsEntityBuilder setRefreshTokenValiditySeconds(int refreshTokenValiditySeconds) {
-	        instance.setRefreshTokenValiditySeconds(refreshTokenValiditySeconds);
-			return this;
-        }
-        
-        /**
-         * Complete the builder
-         * @return
-         */
-		public ClientDetailsEntity finish() {
-			return instance;
-		}
-
-		/**
-         * @param registeredRedirectUri
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setRegisteredRedirectUri(java.lang.String)
-         */
-        public ClientDetailsEntityBuilder setRegisteredRedirectUri(Set<String> registeredRedirectUri) {
-	        instance.setRegisteredRedirectUri(registeredRedirectUri);
-	        return this;
-        }
-
-		/**
-         * @param resourceIds
-         * @see org.mitre.oauth2.model.ClientDetailsEntity#setResourceIds(java.util.List)
-         */
-        public ClientDetailsEntityBuilder setResourceIds(Set<String> resourceIds) {
-	        instance.setResourceIds(resourceIds);
-	        return this;
-        }
-		
-	}
-	
 	/**
 	 * @return the id
 	 */