Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

119 files changed, 436 insertions, 526 deletions

diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
index 55c62eeb1..823b396e9 100644
--- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
@@ -457,7 +457,7 @@ class AVAPattern {
             Enumeration<String> ldapValues = ldapAttr.getStringValues();
 
             for (int i = 0; ldapValues.hasMoreElements(); i++) {
-                String val = (String) ldapValues.nextElement();
+                String val = ldapValues.nextElement();
 
                 if (i == mElement) {
                     value = val;
diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
index 03428102d..b8216d6bc 100644
--- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
@@ -199,7 +199,7 @@ public class AgentCertAuthentication implements IAuthManager,
         Certificates certs = new Certificates(ci);
 
         try {
-            user = (IUser) mCULocator.locateUser(certs);
+            user = mCULocator.locateUser(certs);
         } catch (EUsrGrpException e) {
             throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_CREDENTIAL"));
         } catch (netscape.ldap.LDAPException e) {
diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java
index e44f40e9d..ccee3b512 100644
--- a/base/common/src/com/netscape/cms/authentication/DNPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/DNPattern.java
@@ -211,6 +211,6 @@ public class DNPattern {
     }
 
     public String[] getLdapAttrs() {
-        return (String[]) mLdapAttrs.clone();
+        return mLdapAttrs.clone();
     }
 }
diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
index 2394ede4c..81537f707 100644
--- a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
+++ b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
@@ -514,7 +514,7 @@ public class FlatFileAuth
         AuthToken authToken = new AuthToken(this);
 
         for (int i = 0; i < authAttrs.length; i++) {
-            String ffvalue = (String) user.get(authAttrs[i]);
+            String ffvalue = user.get(authAttrs[i]);
             String uservalue = (String) authCred.get(authAttrs[i]);
 
             // print("checking authentication token (" + authAttrs[i] + ": " + uservalue + " against ff value: " + ffvalue);
@@ -589,7 +589,7 @@ public class FlatFileAuth
         // if a dn was specified in the password file for this user,
         // replace the requested dn with the one in the pwfile
         if (user != null) {
-            String dn = (String) user.get("dn");
+            String dn = user.get("dn");
 
             if (dn != null && authToken != null) {
                 authToken.set(AuthToken.TOKEN_CERT_SUBJECT, dn);
diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
index 2e5b9d394..c94cec617 100644
--- a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
+++ b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
@@ -352,7 +352,7 @@ public class PortalEnroll extends DirBasedAuthentication {
 
         objectclass_values = mObjClasses;
         for (int i = objectclass_values.size() - 1; i >= 0; i--)
-            attr.addValue((String) objectclass_values.elementAt(i));
+            attr.addValue(objectclass_values.elementAt(i));
         attrs.add(attr);
 
         Enumeration<Enumeration<String>> objClasses = mRequiredAttrs.elements();
@@ -369,7 +369,7 @@ public class PortalEnroll extends DirBasedAuthentication {
                 if (attrname.equalsIgnoreCase("objectclass") == true)
                     continue;
                 try {
-                    attrval = (String) argblk.getValueAsString(attrname);
+                    attrval = argblk.getValueAsString(attrname);
                 } catch (EBaseException e) {
                     if (e.getMessage().equalsIgnoreCase(CMS.getUserMessage("CMS_BASE_ATTRIBUTE_NOT_FOUND")) == true)
                         continue;
@@ -393,7 +393,7 @@ public class PortalEnroll extends DirBasedAuthentication {
 
                 CMS.debug("PortalEnroll: attrname is: " + attrname);
                 try {
-                    attrval = (String) argblk.getValueAsString(attrname);
+                    attrval = argblk.getValueAsString(attrname);
                 } catch (EBaseException e) {
                     if (e.getMessage().equalsIgnoreCase(CMS.getUserMessage("CMS_BASE_ATTRIBUTE_NOT_FOUND")) == true)
                         continue;
diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java
index 35e3eb59a..14d5a2f8f 100644
--- a/base/common/src/com/netscape/cms/authentication/RDNPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/RDNPattern.java
@@ -227,6 +227,6 @@ class RDNPattern {
     }
 
     public String[] getLdapAttrs() {
-        return (String[]) mLdapAttrs.clone();
+        return mLdapAttrs.clone();
     }
 }
diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
index 2e6636f27..b47956fb3 100644
--- a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
@@ -110,7 +110,7 @@ public abstract class AAclAuthz {
         Enumeration<String> mImpls = i.getSubStoreNames();
 
         while (mImpls.hasMoreElements()) {
-            String type = (String) mImpls.nextElement();
+            String type = mImpls.nextElement();
             String evalClassPath = null;
 
             try {
@@ -171,7 +171,7 @@ public abstract class AAclAuthz {
     }
 
     public IACL getACL(String target) {
-        return (ACL) mACLs.get(target);
+        return mACLs.get(target);
     }
 
     protected Enumeration<String> getTargetNames() {
@@ -310,7 +310,7 @@ public abstract class AAclAuthz {
      */
     private boolean checkACLs(String name, String perm)
             throws EACLsException {
-        ACL acl = (ACL) mACLs.get(name);
+        ACL acl = mACLs.get(name);
 
         // no such resource, pass it down
         if (acl == null) {
@@ -338,7 +338,7 @@ public abstract class AAclAuthz {
          * must pass all ACLEntry
          */
         for (; e.hasMoreElements();) {
-            ACLEntry entry = (ACLEntry) e.nextElement();
+            ACLEntry entry = e.nextElement();
 
             // if permission not pertinent, move on to next ACLEntry
             if (entry.containPermission(perm) == true) {
@@ -430,7 +430,7 @@ public abstract class AAclAuthz {
         int i = expression.indexOf("=");
         String type = expression.substring(0, i);
         String value = expression.substring(i + 1);
-        IAccessEvaluator evaluator = (IAccessEvaluator) mEvaluators.get(type);
+        IAccessEvaluator evaluator = mEvaluators.get(type);
 
         if (evaluator == null) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_NOT_FOUND", type));
@@ -486,7 +486,7 @@ public abstract class AAclAuthz {
         boolean permitted = false;
 
         while (entries.hasMoreElements()) {
-            ACLEntry entry = (ACLEntry) entries.nextElement();
+            ACLEntry entry = entries.nextElement();
 
             CMS.debug("checkACLS(): ACLEntry expressions= " +
                     entry.getAttributeExpressions());
@@ -504,7 +504,7 @@ public abstract class AAclAuthz {
             entries = getDenyEntries(nodes, perm);
 
         while (entries.hasMoreElements()) {
-            ACLEntry entry = (ACLEntry) entries.nextElement();
+            ACLEntry entry = entries.nextElement();
 
             CMS.debug("checkACLS(): ACLEntry expressions= " +
                     entry.getAttributeExpressions());
@@ -541,13 +541,13 @@ public abstract class AAclAuthz {
         Vector<ACLEntry> v = new Vector<ACLEntry>();
 
         while (nodes.hasMoreElements()) {
-            name = (String) nodes.nextElement();
-            acl = (ACL) mACLs.get(name);
+            name = nodes.nextElement();
+            acl = mACLs.get(name);
             if (acl == null)
                 continue;
             e = acl.entries();
             while (e.hasMoreElements()) {
-                ACLEntry entry = (ACLEntry) e.nextElement();
+                ACLEntry entry = e.nextElement();
 
                 if (!entry.isNegative() &&
                         entry.containPermission(operation)) {
@@ -566,8 +566,8 @@ public abstract class AAclAuthz {
         Vector<ACLEntry> v = new Vector<ACLEntry>();
 
         while (nodes.hasMoreElements()) {
-            name = (String) nodes.nextElement();
-            acl = (ACL) mACLs.get(name);
+            name = nodes.nextElement();
+            acl = mACLs.get(name);
             if (acl == null)
                 continue;
             e = acl.entries();
@@ -690,7 +690,7 @@ public abstract class AAclAuthz {
             type = expression.substring(0, i).trim();
             value = expression.substring(i + len).trim();
         }
-        IAccessEvaluator evaluator = (IAccessEvaluator) mEvaluators.get(type);
+        IAccessEvaluator evaluator = mEvaluators.get(type);
 
         if (evaluator == null) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_NOT_FOUND", type));
@@ -799,7 +799,7 @@ public abstract class AAclAuthz {
      * @return true if unique; false otherwise
      */
     public boolean isTypeUnique(String type) {
-        if (mACLs.containsKey((Object) type)) {
+        if (mACLs.containsKey(type)) {
             return false;
         } else {
             return true;
diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
index 040ff5297..bf4ca7f5a 100644
--- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
@@ -164,7 +164,7 @@ public class DirAclAuthz extends AAclAuthz
                 LDAPAttribute aclRes = entry.getAttribute("resourceACLS");
 
                 @SuppressWarnings("unchecked")
-                Enumeration<String> en = (Enumeration<String>) aclRes.getStringValues();
+                Enumeration<String> en = aclRes.getStringValues();
 
                 for (; en != null && en.hasMoreElements();) {
                     addACLs(en.nextElement());
@@ -294,7 +294,7 @@ public class DirAclAuthz extends AAclAuthz
 
             if (en.hasMoreElements() == true) {
                 while (en.hasMoreElements()) {
-                    ACL a = (ACL) en.nextElement();
+                    ACL a = en.nextElement();
                     String resAclString = a.getResourceACLs();
 
                     attrs.addValue(resAclString);
diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
index 3f5ea2399..a34a99373 100644
--- a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
@@ -95,7 +95,7 @@ public class CMSAuthorityKeyIdentifierExtension
 
                     if (caCertExtensions != null) {
                         for (int i = 0; i < caCertExtensions.size(); i++) {
-                            Extension caCertExt = (Extension) caCertExtensions.elementAt(i);
+                            Extension caCertExt = caCertExtensions.elementAt(i);
 
                             if (caCertExt instanceof SubjectKeyIdentifierExtension) {
                                 SubjectKeyIdentifierExtension id =
diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
index cddb8d56a..b28e93751 100644
--- a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
+++ b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.jobs;
 
-import java.security.cert.X509Certificate;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Enumeration;
@@ -286,7 +285,7 @@ public class UnpublishExpiredJob extends AJobBase
                 try {
                     if ((mPublisherProcessor != null) &&
                             mPublisherProcessor.enabled()) {
-                        mPublisherProcessor.unpublishCert((X509Certificate) cert, req);
+                        mPublisherProcessor.unpublishCert(cert, req);
                         if (mSummary == true)
                             buildItemParams(IEmailFormProcessor.TOKEN_STATUS,
                                     STATUS_SUCCESS);
@@ -309,7 +308,7 @@ public class UnpublishExpiredJob extends AJobBase
                 try {
                     if ((mPublisherProcessor != null) &&
                             mPublisherProcessor.enabled()) {
-                        mPublisherProcessor.unpublishCert((X509Certificate) cert, null);
+                        mPublisherProcessor.unpublishCert(cert, null);
                         if (mSummary == true)
                             buildItemParams(IEmailFormProcessor.TOKEN_STATUS,
                                     STATUS_SUCCESS);
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
index dc0222dda..44ff46a9b 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
@@ -354,11 +354,10 @@ public class CertificateIssuedListener implements IRequestListener {
                 }
 
                 // build some token data
-                mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-                        mConfig.getName());
+                mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName());
                 mReqId = r.getRequestId();
                 mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                        (Object) mReqId.toString());
+                        mReqId.toString());
                 IEmailFormProcessor et = CMS.getEmailFormProcessor();
                 String c = et.getEmailContent(template.toString(), mContentParams);
 
@@ -402,12 +401,12 @@ public class CertificateIssuedListener implements IRequestListener {
         mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
                 issuedCert[0].getSubjectDN().toString());
 
-        Date date = (Date) issuedCert[0].getNotAfter();
+        Date date = issuedCert[0].getNotAfter();
 
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_AFTER,
                 mDateFormat.format(date));
 
-        date = (Date) issuedCert[0].getNotBefore();
+        date = issuedCert[0].getNotBefore();
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_BEFORE,
                 mDateFormat.format(date));
 
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
index ad91738e9..b361057b4 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
@@ -311,7 +311,7 @@ public class CertificateRevokedListener implements IRequestListener {
                 mHttpPort);
 
         try {
-            RevokedCertImpl revCert = (RevokedCertImpl) crlentries[0];
+            RevokedCertImpl revCert = crlentries[0];
             ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository certDB = ca.getCertificateRepository();
             X509Certificate cert = certDB.getX509Certificate(revCert.getSerialNumber());
@@ -320,7 +320,7 @@ public class CertificateRevokedListener implements IRequestListener {
                     cert.getIssuerDN().toString());
             mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
                     cert.getSubjectDN().toString());
-            Date date = (Date) crlentries[0].getRevocationDate();
+            Date date = crlentries[0].getRevocationDate();
 
             mContentParams.put(IEmailFormProcessor.TOKEN_REVOCATION_DATE,
                     mDateFormat.format(date));
diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
index 3d236baea..f1f396ca3 100644
--- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
@@ -227,25 +227,19 @@ public class RequestInQListener implements IRequestListener {
 
         RequestId reqId = r.getRequestId();
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                (Object) reqId.toString());
+        mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID, reqId.toString());
 
         mContentParams.put(IEmailFormProcessor.TOKEN_ID, mId);
 
         val = r.getRequestType();
         if (val != null)
-            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE,
-                    val);
+            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE, val);
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST,
-                (Object) mHttpHost);
-        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT,
-                (Object) mAgentPort);
+        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST, mHttpHost);
+        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT, mAgentPort);
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL,
-                (Object) mSenderEmail);
-        mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL,
-                (Object) mRecipientEmail);
+        mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL, mSenderEmail);
+        mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL, mRecipientEmail);
     }
 
     /**
diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java
index fa5531a8e..95d4b34bf 100644
--- a/base/common/src/com/netscape/cms/logging/LogFile.java
+++ b/base/common/src/com/netscape/cms/logging/LogFile.java
@@ -1321,16 +1321,16 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
         int maxLine = -1, level = -1, source = -1;
         Vector<LogEntry> entries = null;
 
-        if ((tmp = (String) req.get(Constants.PR_LOG_ENTRY)) != null) {
+        if ((tmp = req.get(Constants.PR_LOG_ENTRY)) != null) {
             maxLine = Integer.parseInt(tmp);
         }
-        if ((tmp = (String) req.get(Constants.PR_LOG_LEVEL)) != null) {
+        if ((tmp = req.get(Constants.PR_LOG_LEVEL)) != null) {
             level = Integer.parseInt(tmp);
         }
-        if ((tmp = (String) req.get(Constants.PR_LOG_SOURCE)) != null) {
+        if ((tmp = req.get(Constants.PR_LOG_SOURCE)) != null) {
             source = Integer.parseInt(tmp);
         }
-        tmp = (String) req.get(Constants.PR_LOG_NAME);
+        tmp = req.get(Constants.PR_LOG_NAME);
         if (!(tmp.equals(Constants.PR_CURRENT_LOG))) {
             fName = tmp;
         } else {
@@ -1341,7 +1341,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
             entries = readEntry(maxLine, level, source, fName);
             for (int i = 0; i < entries.size(); i++) {
                 params.put(Integer.toString(i) +
-                        ((LogEntry) entries.elementAt(i)).getEntry(), "");
+                        entries.elementAt(i).getEntry(), "");
             }
         } catch (Exception e) {
             CMS.getLogger().log(ILogger.EV_SYSTEM, ILogger.S_OTHER,
diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
index 312978fae..d420f547d 100644
--- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
@@ -461,7 +461,7 @@ public class RollingLogFile extends LogFile {
                     // First, remove any old log files and figure out when the
                     // next one expires
                     try {
-                        wakeupTime = expire((long) (mExpirationTime / 1000));
+                        wakeupTime = expire(mExpirationTime / 1000);
                     } catch (SecurityException e) {
                         ConsoleError.send(new
                                 SystemEvent(CMS.getUserMessage("CMS_LOG_EXPIRE_LOG_FAILED", e.toString())));
diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java
index f9798270a..5cee87273 100644
--- a/base/common/src/com/netscape/cms/ocsp/DefStore.java
+++ b/base/common/src/com/netscape/cms/ocsp/DefStore.java
@@ -203,7 +203,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
     }
 
     public long getReqCount(String id) {
-        Long c = (Long) mReqCounts.get(id);
+        Long c = mReqCounts.get(id);
 
         if (c == null)
             return 0;
@@ -234,8 +234,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
         IDBSSession s = mDBService.createSession();
 
         try {
-            ICRLIssuingPointRecord cp = (ICRLIssuingPointRecord)
-                    readCRLIssuingPoint(caName);
+            ICRLIssuingPointRecord cp = readCRLIssuingPoint(caName);
 
             if (cp == null)
                 return; // nothing to do
@@ -264,7 +263,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
                         getBaseDN();
 
                 while (recs != null && recs.hasMoreElements()) {
-                    ICertRecord rec = (ICertRecord) recs.nextElement();
+                    ICertRecord rec = recs.nextElement();
                     String cert_dn = "cn=" +
                             rec.getSerialNumber().toString() + "," + rep_dn;
 
@@ -424,8 +423,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
             X509CRLImpl theCRL = null;
             ICRLIssuingPointRecord theRec = null;
             byte keyhsh[] = cid.getIssuerKeyHash().toByteArray();
-            CRLIPContainer matched = (CRLIPContainer)
-                    mCacheCRLIssuingPoints.get(new String(keyhsh));
+            CRLIPContainer matched = mCacheCRLIssuingPoints.get(new String(keyhsh));
 
             if (matched == null) {
                 Enumeration<ICRLIssuingPointRecord> recs = searchCRLIssuingPointRecord(
@@ -513,8 +511,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
                         CMS.debug("DefStore: evaluating crl cache");
                         Hashtable<BigInteger, RevokedCertificate> cache = theRec.getCRLCacheNoClone();
                         if (cache != null) {
-                            RevokedCertificate rc = (RevokedCertificate)
-                                    cache.get(new BigInteger(serialNo.toString()));
+                            RevokedCertificate rc = cache.get(new BigInteger(serialNo.toString()));
                             if (rc == null) {
                                 if (isNotFoundGood()) {
                                     certStatus = new GoodInfo();
@@ -671,7 +668,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
             String dn = "cn=" +
                     transformDN(name) + "," + getBaseDN();
 
-            s.add(dn, (ICRLIssuingPointRecord) rec);
+            s.add(dn, rec);
         } finally {
             if (s != null)
                 s.close();
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
index f8cd03f75..2129f0f00 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
@@ -68,7 +68,7 @@ public class AgentPolicy extends APolicyRule
             throws EPolicyException {
 
         // Create subordinate object
-        String className = (String) config.get("class");
+        String className = config.get("class");
 
         System.err.println("Creating agent policy with class " + className);
         if (className != null) {
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
index 4ee689915..06f94d599 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
@@ -350,7 +350,7 @@ public class AttributePresentConstraints extends APolicyRule
 
         while (e.hasMoreElements()) {
             try {
-                String paramName = (String) e.nextElement();
+                String paramName = e.nextElement();
                 String paramValue = mParamValue.get(paramName).toString();
                 String temp = paramName + "=" + paramValue;
 
@@ -369,7 +369,7 @@ public class AttributePresentConstraints extends APolicyRule
 
         while (e.hasMoreElements()) {
             try {
-                String paramName = (String) e.nextElement();
+                String paramName = e.nextElement();
                 String paramValue = mParamDefault.get(paramName).toString();
                 String temp = paramName + "=" + paramValue;
 
diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
index 43b7e1fd6..efd306bf3 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
@@ -150,8 +150,7 @@ public class IssuerConstraints extends APolicyRule
                 }
 
                 for (int i = 0; i < certInfo.length; i++) {
-                    String oldIssuer = (String)
-                            certInfo[i].get(X509CertInfo.ISSUER).toString();
+                    String oldIssuer = certInfo[i].get(X509CertInfo.ISSUER).toString();
 
                     if (oldIssuer == null) {
                         setError(req,
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
index a1f0805d0..363856197 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
@@ -224,7 +224,7 @@ public class RSAKeyConstraints extends APolicyRule
                         StringBuffer sb = new StringBuffer();
 
                         for (Enumeration<BigInt> e = mExponents.elements(); e.hasMoreElements();) {
-                            BigInt bi = (BigInt) e.nextElement();
+                            BigInt bi = e.nextElement();
 
                             sb.append(bi.toBigInteger().toString());
                             sb.append(" ");
diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
index 90a8cc167..15b12af40 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
@@ -131,7 +131,7 @@ public class SigningAlgorithmConstraints extends APolicyRule
 
                 mAllowedAlgs = new String[itemCount];
                 for (int i = 0; i < itemCount; i++) {
-                    mAllowedAlgs[i] = (String) algs.elementAt(i);
+                    mAllowedAlgs[i] = algs.elementAt(i);
                 }
 
             }
@@ -239,7 +239,7 @@ public class SigningAlgorithmConstraints extends APolicyRule
         if (mAllowedAlgs.length != goodSize) {
             mAllowedAlgs = new String[goodSize];
             for (i = 0; i < goodSize; i++) {
-                mAllowedAlgs[i] = (String) goodAlgs.elementAt(i);
+                mAllowedAlgs[i] = goodAlgs.elementAt(i);
             }
         }
     }
diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
index 93267bd1e..5f33efe1b 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
@@ -174,7 +174,7 @@ public class ExtendedKeyUsageExt extends APolicyRule
                 params.addElement(PROP_PURPOSE_ID +
                         Integer.toString(i) + "=");
             } else {
-                usage = ((ObjectIdentifier) mUsages.elementAt(i)).toString();
+                usage = mUsages.elementAt(i).toString();
                 if (usage == null) {
                     params.addElement(PROP_PURPOSE_ID +
                             Integer.toString(i) + "=");
diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
index eb8ab2285..35f5313c1 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
@@ -434,7 +434,7 @@ public class GenericASN1Ext extends APolicyRule implements
         Enumeration<String> e = mConfig.getPropertyNames();
 
         while (e.hasMoreElements()) {
-            String n = (String) e.nextElement();
+            String n = e.nextElement();
 
             h.put(n, mConfig.getString(n));
         }
diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
index 46bc1a787..b44a71ee8 100644
--- a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
@@ -107,8 +107,7 @@ public class CAEnrollProfile extends EnrollProfile {
 
         // do not archive keys for renewal requests
         if ((optionsData != null) && (!request.getRequestType().equals(IRequest.RENEWAL_REQUEST))) {
-            PKIArchiveOptions options = (PKIArchiveOptions)
-                    toPKIArchiveOptions(optionsData);
+            PKIArchiveOptions options = toPKIArchiveOptions(optionsData);
 
             if (options != null) {
                 CMS.debug("CAEnrollProfile: execute found " +
diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
index 8bcb59c86..1fe2fa514 100644
--- a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
@@ -73,7 +73,7 @@ public class RAEnrollProfile extends EnrollProfile {
 
         IRegistrationAuthority ra =
                 (IRegistrationAuthority) getAuthority();
-        IRAService raService = (IRAService) ra.getRAService();
+        IRAService raService = ra.getRAService();
 
         if (raService == null) {
             throw new EProfileException("No RA Service");
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
index 8d7a67a77..869f0e2cc 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
@@ -126,7 +126,6 @@ public class UniqueKeyConstraint extends EnrollConstraint {
             String pub_s = escapeBinaryData(pub);
             String filter = "(" + ICertRecord.ATTR_X509CERT_PUBLIC_KEY_DATA + "=" + pub_s + ")";
             list =
-                    (ICertRecordList)
                     mCA.getCertificateRepository().findCertRecordsInList(filter, null, 10);
             size = list.getSize();
 
diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
index e68ffca07..9629e4990 100644
--- a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
@@ -247,7 +247,7 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault {
         StringTokenizer st = new StringTokenizer(value, "\r\n");
         Hashtable<String, String> table = new Hashtable<String, String>();
         while (st.hasMoreTokens()) {
-            String token = (String) st.nextToken();
+            String token = st.nextToken();
             int index = token.indexOf(":");
             if (index <= 0)
                 throw new EPropertyException(CMS.getUserMessage(
@@ -287,15 +287,15 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault {
 
                 Hashtable<String, String> h = buildRecords(value);
 
-                String numStr = (String) h.get(CONFIG_POLICY_NUM);
+                String numStr = h.get(CONFIG_POLICY_NUM);
                 int size = Integer.parseInt(numStr);
 
                 Vector<CertificatePolicyInfo> certificatePolicies = new Vector<CertificatePolicyInfo>();
                 for (int i = 0; i < size; i++) {
-                    String enable = (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ENABLE);
+                    String enable = h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ENABLE);
                     CertificatePolicyInfo cinfo = null;
                     if (enable != null && enable.equals("true")) {
-                        String policyId = (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ID);
+                        String policyId = h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ID);
 
                         if (policyId == null || policyId.length() == 0)
                             throw new EPropertyException(CMS.getUserMessage(
@@ -303,40 +303,39 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault {
                         CertificatePolicyId cpolicyId = getPolicyId(policyId);
 
                         String qualifersNum =
-                                (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_QUALIFIERS_NUM);
+                                h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_QUALIFIERS_NUM);
                         PolicyQualifiers policyQualifiers = new PolicyQualifiers();
                         int num = 0;
                         if (qualifersNum != null && qualifersNum.length() > 0)
                             num = Integer.parseInt(qualifersNum);
                         for (int j = 0; j < num; j++) {
                             String cpsuriEnable =
-                                    (String) h.get(CONFIG_PREFIX
-                                            + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_ENABLE);
+                                    h.get(CONFIG_PREFIX
+                                    + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_ENABLE);
                             String usernoticeEnable =
-                                    (String) h
-                                            .get(CONFIG_PREFIX
-                                                    + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
-                                                    + CONFIG_USERNOTICE_ENABLE);
+                                    h.get(CONFIG_PREFIX
+                                            + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
+                                            + CONFIG_USERNOTICE_ENABLE);
                             if (cpsuriEnable != null && cpsuriEnable.equals("true")) {
                                 String cpsuri =
-                                        (String) h.get(CONFIG_PREFIX
-                                                + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_VALUE);
+                                        h.get(CONFIG_PREFIX
+                                        + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_VALUE);
                                 netscape.security.x509.PolicyQualifierInfo qualifierInfo = createCPSuri(cpsuri);
                                 if (qualifierInfo != null)
                                     policyQualifiers.add(qualifierInfo);
                             } else if (usernoticeEnable != null && enable.equals("true")) {
                                 String org =
-                                        (String) h.get(CONFIG_PREFIX
-                                                + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
-                                                + CONFIG_USERNOTICE_ORG);
+                                        h.get(CONFIG_PREFIX
+                                        + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
+                                        + CONFIG_USERNOTICE_ORG);
                                 String noticenumbers =
-                                        (String) h.get(CONFIG_PREFIX
-                                                + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
-                                                + CONFIG_USERNOTICE_NUMBERS);
+                                        h.get(CONFIG_PREFIX
+                                        + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
+                                        + CONFIG_USERNOTICE_NUMBERS);
                                 String explicitText =
-                                        (String) h.get(CONFIG_PREFIX
-                                                + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
-                                                + CONFIG_USERNOTICE_TEXT);
+                                        h.get(CONFIG_PREFIX
+                                        + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR
+                                        + CONFIG_USERNOTICE_TEXT);
                                 netscape.security.x509.PolicyQualifierInfo qualifierInfo = createUserNotice(org,
                                         noticenumbers, explicitText);
                                 if (qualifierInfo != null)
@@ -345,11 +344,9 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault {
                         }
 
                         if (policyQualifiers.size() <= 0) {
-                            cinfo =
-                                    new CertificatePolicyInfo(cpolicyId);
+                            cinfo = new CertificatePolicyInfo(cpolicyId);
                         } else {
-                            cinfo =
-                                    new CertificatePolicyInfo(cpolicyId, policyQualifiers);
+                            cinfo = new CertificatePolicyInfo(cpolicyId, policyQualifiers);
                         }
                         if (cinfo != null)
                             certificatePolicies.addElement(cinfo);
@@ -762,7 +759,7 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault {
             nums = new int[numsVector.size()];
             try {
                 for (int i = 0; i < numsVector.size(); i++) {
-                    Integer ii = new Integer((String) numsVector.elementAt(i));
+                    Integer ii = new Integer(numsVector.elementAt(i));
                     nums[i] = ii.intValue();
                 }
             } catch (Exception e) {
diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
index d5d88c29e..4a8acace1 100644
--- a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
@@ -109,24 +109,21 @@ public class GenericExtDefault extends EnrollExtDefault {
 
             ObjectIdentifier oid = new ObjectIdentifier(getConfig(CONFIG_OID));
 
-            ext = (Extension)
-                        getExtension(oid.toString(), info);
+            ext = getExtension(oid.toString(), info);
 
             if (ext == null) {
                 populate(null, info);
             }
 
             if (name.equals(VAL_CRITICAL)) {
-                ext = (Extension)
-                        getExtension(oid.toString(), info);
+                ext = getExtension(oid.toString(), info);
                 if (ext == null) {
                     return;
                 }
                 boolean val = Boolean.valueOf(value).booleanValue();
                 ext.setCritical(val);
             } else if (name.equals(VAL_DATA)) {
-                ext = (Extension)
-                        getExtension(oid.toString(), info);
+                ext = getExtension(oid.toString(), info);
                 if (ext == null) {
                     return;
                 }
@@ -155,8 +152,7 @@ public class GenericExtDefault extends EnrollExtDefault {
 
         ObjectIdentifier oid = new ObjectIdentifier(getConfig(CONFIG_OID));
 
-        ext = (Extension)
-                    getExtension(oid.toString(), info);
+        ext = getExtension(oid.toString(), info);
 
         if (ext == null) {
             try {
@@ -171,8 +167,7 @@ public class GenericExtDefault extends EnrollExtDefault {
 
         if (name.equals(VAL_CRITICAL)) {
 
-            ext = (Extension)
-                    getExtension(oid.toString(), info);
+            ext = getExtension(oid.toString(), info);
 
             if (ext == null) {
                 return null;
@@ -184,8 +179,7 @@ public class GenericExtDefault extends EnrollExtDefault {
             }
         } else if (name.equals(VAL_DATA)) {
 
-            ext = (Extension)
-                    getExtension(oid.toString(), info);
+            ext = getExtension(oid.toString(), info);
 
             if (ext == null)
                 return "";
@@ -218,7 +212,7 @@ public class GenericExtDefault extends EnrollExtDefault {
             if ((data[i] & 0xff) < 16) {
                 b.append("0");
             }
-            b.append(Integer.toString((int) (data[i] & 0xff), 0x10));
+            b.append(Integer.toString((data[i] & 0xff), 0x10));
         }
         return b.toString();
     }
diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
index 3feddd628..ec203713b 100644
--- a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
@@ -160,7 +160,7 @@ public class IssuerAltNameExtDefault extends EnrollExtDefault {
                 StringTokenizer st = new StringTokenizer(value, "\r\n");
 
                 while (st.hasMoreTokens()) {
-                    String gname = (String) st.nextToken();
+                    String gname = st.nextToken();
 
                     GeneralNameInterface n = parseGeneralName(gname);
                     if (n != null) {
diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
index 929878de3..f010b6134 100644
--- a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
@@ -516,7 +516,7 @@ public class NameConstraintsExtDefault extends EnrollExtDefault {
         Vector<NameValuePairs> recs = new Vector<NameValuePairs>();
 
         for (int i = 0; i < size; i++) {
-            GeneralSubtree tree = (GeneralSubtree) trees.elementAt(i);
+            GeneralSubtree tree = trees.elementAt(i);
 
             GeneralName gn = tree.getGeneralName();
             String type = getGeneralNameType(gn);
diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
index 55a9e420e..56d67a93e 100644
--- a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
@@ -316,8 +316,7 @@ public class PolicyMappingsExtDefault extends EnrollExtDefault {
                 NameValuePairs pairs = new NameValuePairs();
 
                 if (maps.hasMoreElements()) {
-                    CertificatePolicyMap map =
-                            (CertificatePolicyMap) maps.nextElement();
+                    CertificatePolicyMap map = maps.nextElement();
 
                     CertificatePolicyId i1 = map.getIssuerIdentifier();
                     CertificatePolicyId s1 = map.getSubjectIdentifier();
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
index 0aa92937f..4bb1d0309 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
@@ -268,7 +268,7 @@ public class SubjectAltNameExtDefault extends EnrollExtDefault {
                 StringTokenizer st = new StringTokenizer(value, "\r\n");
 
                 while (st.hasMoreTokens()) {
-                    String gname = (String) st.nextToken();
+                    String gname = st.nextToken();
                     CMS.debug("SubjectAltNameExtDefault: setValue GN:" + gname);
 
                     if (!isGeneralNameValid(gname)) {
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
index 813e92a28..a60721733 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
@@ -333,10 +333,10 @@ public class SubjectDirAttributesExtDefault extends EnrollExtDefault {
                 StringBuffer ss = new StringBuffer();
                 while (v.hasMoreElements()) {
                     if (ss.length() == 0)
-                        ss.append((String) (v.nextElement()));
+                        ss.append(v.nextElement());
                     else {
                         ss.append(",");
-                        ss.append((String) (v.nextElement()));
+                        ss.append(v.nextElement());
                     }
                 }
 
diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
index acac975cb..0dff1da6b 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
@@ -431,8 +431,7 @@ class AVAPattern {
             if (extensions != null) {
 
                 for (int i = 0; i < extensions.size(); i++) {
-                    Extension ext = (Extension)
-                            extensions.elementAt(i);
+                    Extension ext = extensions.elementAt(i);
 
                     String extName =
                             OIDMap.getName(ext.getExtensionId());
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
index a1a65a342..1b1531000 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
@@ -287,9 +287,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo {
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-
-            subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
 
             CMS.debug("LdapCaSimpleMap: cert subject dn:" + subjectDN.toString());
             X509CertInfo info = (X509CertInfo)
@@ -307,9 +305,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo {
         } catch (ClassCastException e) {
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
-
-                subjectDN =
-                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug("LdapCaSimpleMap: crl issuer dn: " +
                         subjectDN.toString());
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
index d1a734b82..8ed702f50 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
@@ -129,8 +129,7 @@ public class LdapCertCompsMap
             X509Certificate cert = (X509Certificate) obj;
             String result = null;
             // form dn and filter for search.
-            X500Name subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            X500Name subjectDN = (X500Name) cert.getSubjectDN();
 
             CMS.debug("LdapCertCompsMap: " + subjectDN.toString());
 
@@ -146,8 +145,7 @@ public class LdapCertCompsMap
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
                 String result = null;
-                X500Name issuerDN =
-                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                X500Name issuerDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug("LdapCertCompsMap: " + issuerDN.toString());
 
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
index 5c085481d..21a3a0794 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
@@ -117,17 +117,13 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo {
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-
-            subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
 
             CMS.debug("LdapCertExactMap: cert subject dn:" + subjectDN.toString());
         } catch (ClassCastException e) {
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
-
-                subjectDN =
-                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug("LdapCertExactMap: crl issuer dn: " +
                         subjectDN.toString());
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
index 61ffef947..a1f7207f6 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
@@ -185,17 +185,13 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo {
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-
-            subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
 
             CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString());
         } catch (ClassCastException e) {
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
-
-                subjectDN =
-                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug("LdapCertSubjMap: crl issuer dn: " +
                         subjectDN.toString());
@@ -271,7 +267,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo {
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-            subjectDN = (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
             CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString());
         } catch (ClassCastException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_NOT_SUPPORTED_OBJECT"));
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
index 7c4c3c4b0..ca5903ee0 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
@@ -124,8 +124,7 @@ public class LdapCrlIssuerCompsMap
 
         try {
             String result = null;
-            X500Name issuerDN =
-                    (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+            X500Name issuerDN = (X500Name) crl.getIssuerDN();
 
             CMS.debug("LdapCrlIssuerCompsMap: " + issuerDN.toString());
 
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
index 1f7f06f69..96ff2a11e 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
@@ -185,9 +185,9 @@ public class LdapDNCompsMap
 
         mBaseDN = baseDN;
         if (dnComps != null)
-            mDnComps = (ObjectIdentifier[]) dnComps.clone();
+            mDnComps = dnComps.clone();
         if (filterComps != null)
-            mFilterComps = (ObjectIdentifier[]) filterComps.clone();
+            mFilterComps = filterComps.clone();
 
         // log debug info.
         for (int i = 0; i < mDnComps.length; i++) {
@@ -317,7 +317,7 @@ public class LdapDNCompsMap
         try {
             // get the base DN & filter.
             for (Enumeration<RDN> n = subjName.getRDNs(); n.hasMoreElements();) {
-                RDN rdn = (RDN) n.nextElement();
+                RDN rdn = n.nextElement();
                 // NOTE assumes one AVA per RDN.
                 AVA ava = rdn.getAssertion()[0];
                 ObjectIdentifier oid = ava.getOid();
@@ -378,11 +378,11 @@ public class LdapDNCompsMap
     }
 
     public ObjectIdentifier[] getDnComps() {
-        return (ObjectIdentifier[]) mDnComps.clone();
+        return mDnComps.clone();
     }
 
     public ObjectIdentifier[] getFilterComps() {
-        return (ObjectIdentifier[]) mFilterComps.clone();
+        return mFilterComps.clone();
     }
 
     /**
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
index d94032071..a970602bd 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
@@ -217,9 +217,7 @@ public class LdapEnhancedMap
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-
-            subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
             CMS.debug(
                     "LdapEnhancedMap: cert subject dn:" +
                             subjectDN.toString());
@@ -248,13 +246,10 @@ public class LdapEnhancedMap
 
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
-
-                subjectDN = (X500Name)
-                        ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug(
                         "LdapEnhancedMap: crl issuer dn: " +
-
                         subjectDN.toString());
             } catch (ClassCastException ex) {
                 log(ILogger.LL_FAILURE,
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
index 67d98f4cc..8f88ffaba 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
@@ -248,9 +248,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
 
         try {
             X509Certificate cert = (X509Certificate) obj;
-
-            subjectDN =
-                    (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = (X500Name) cert.getSubjectDN();
 
             CMS.debug("LdapSimpleMap: cert subject dn:" + subjectDN.toString());
             //certExt = (CertificateExtensions)
@@ -270,9 +268,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
         } catch (ClassCastException e) {
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
-
-                subjectDN =
-                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = (X500Name) crl.getIssuerDN();
 
                 CMS.debug("LdapSimpleMap: crl issuer dn: " +
                         subjectDN.toString());
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
index ef7fa9d13..cd298bc3b 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
@@ -522,8 +522,7 @@ class MapAVAPattern {
         if (TYPE_EXT.equals(mType)) {
             if (extensions != null) {
                 for (int i = 0; i < extensions.size(); i++) {
-                    Extension ext = (Extension)
-                            extensions.elementAt(i);
+                    Extension ext = extensions.elementAt(i);
                     String extName = OIDMap.getName(ext.getExtensionId());
                     int index = extName.lastIndexOf(".");
 
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
index dc446a7b7..6656f4a1f 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
@@ -192,10 +192,10 @@ public class MapDNPattern {
     }
 
     public String[] getReqAttrs() {
-        return (String[]) mReqAttrs.clone();
+        return mReqAttrs.clone();
     }
 
     public String[] getCertAttrs() {
-        return (String[]) mCertAttrs.clone();
+        return mCertAttrs.clone();
     }
 }
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
index 61da1d7d2..058294d7c 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
@@ -208,10 +208,10 @@ class MapRDNPattern {
     }
 
     public String[] getReqAttrs() {
-        return (String[]) mReqAttrs.clone();
+        return mReqAttrs.clone();
     }
 
     public String[] getCertAttrs() {
-        return (String[]) mCertAttrs.clone();
+        return mCertAttrs.clone();
     }
 }
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
index 8dada61fb..68b1205ad 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
@@ -328,7 +328,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin
         byte[] val = null;
 
         while (vals.hasMoreElements()) {
-            val = (byte[]) vals.nextElement();
+            val = vals.nextElement();
             if (PublisherUtils.byteArraysAreEqual(val, bval)) {
                 return true;
             }
diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java
index 073bdcce4..568d6f412 100644
--- a/base/common/src/com/netscape/cms/request/RequestScheduler.java
+++ b/base/common/src/com/netscape/cms/request/RequestScheduler.java
@@ -54,12 +54,12 @@ public class RequestScheduler implements IRequestScheduler {
      */
     public synchronized void requestOut(IRequest r) {
         Thread current = Thread.currentThread();
-        Thread first = (Thread) mRequestThreads.elementAt(0);
+        Thread first = mRequestThreads.elementAt(0);
 
         if (current.equals(first)) {
             // reprioritize
             try {
-                Thread second = (Thread) mRequestThreads.elementAt(1);
+                Thread second = mRequestThreads.elementAt(1);
 
                 second.setPriority(Thread.MAX_PRIORITY);
             } catch (Exception e) {
diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java
index 6857f3c46..e77ece551 100644
--- a/base/common/src/com/netscape/cms/selftests/ASelfTest.java
+++ b/base/common/src/com/netscape/cms/selftests/ASelfTest.java
@@ -94,7 +94,7 @@ public abstract class ASelfTest
             EInvalidSelfTestException,
             EMissingSelfTestException {
         // store individual self test class values for this instance
-        mSelfTestSubsystem = (ISelfTestSubsystem) subsystem;
+        mSelfTestSubsystem = subsystem;
 
         // strip preceding/trailing whitespace
         // from passed-in String parameters
diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
index 7183db613..832d2b747 100644
--- a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
@@ -225,7 +225,7 @@ public class KRAPresence
             }
 
             // Retrieve the KRA certificate public key
-            kraPubKey = (PublicKey) kraCert.getPublicKey();
+            kraPubKey = kraCert.getPublicKey();
 
             if (kraPubKey == null) {
                 // log that something is seriously wrong with the KRA
diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
index e279cf608..6facd807c 100644
--- a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
@@ -235,7 +235,7 @@ public class RAPresence
             }
 
             // Retrieve the RA certificate public key
-            raPubKey = (PublicKey) raCert.getPublicKey();
+            raPubKey = raCert.getPublicKey();
 
             if (raPubKey == null) {
                 // log that something is seriously wrong with the RA
diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
index bee89a59c..985b4ef8b 100644
--- a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
+++ b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
@@ -102,7 +102,7 @@ public class TKSKnownSessionKey
         mUseSoftToken = getConfigString("useSoftToken");
 
         String defKeySetMacKey = null;
-        tks = (ISubsystem) CMS.getSubsystem(mTksSubId);
+        tks = CMS.getSubsystem(mTksSubId);
         if (tks != null) {
             tksConfig = tks.getConfigStore();
             if (tksConfig != null) {
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 7a08ce966..22c979f28 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
@@ -236,7 +236,7 @@ public class ACLAdminServlet extends AdminServlet {
         Enumeration<ACL> res = mAuthzMgr.getACLs();
 
         while (res.hasMoreElements()) {
-            ACL acl = (ACL) res.nextElement();
+            ACL acl = res.nextElement();
             String desc = acl.getDescription();
 
             if (desc == null)
@@ -296,7 +296,7 @@ public class ACLAdminServlet extends AdminServlet {
                     if (acis != "") {
                         acis += ";";
                     }
-                    ACLEntry aclEntry = (ACLEntry) aclEntryEnum.nextElement();
+                    ACLEntry aclEntry = aclEntryEnum.nextElement();
                     String aci = aclEntry.getACLEntryString();
 
                     acis += aci;
@@ -788,7 +788,7 @@ public class ACLAdminServlet extends AdminServlet {
 
             // it's possibl that it's being used...we have to assume that
             // the administrator knows what she is doing, for now
-            mEvaluators.remove((Object) id);
+            mEvaluators.remove(id);
 
             try {
                 IConfigStore destStore =
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index 5e6e7889f..ee1b53ed5 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletResponse;
 import netscape.security.x509.X509CertImpl;
 
 import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.authentication.AuthToken;
 import com.netscape.certsrv.authentication.IAuthCredentials;
 import com.netscape.certsrv.authentication.IAuthManager;
 import com.netscape.certsrv.authentication.IAuthSubsystem;
@@ -261,7 +260,7 @@ public class AdminServlet extends HttpServlet {
         StringTokenizer tokenizer = new StringTokenizer(info, "#");
 
         while (tokenizer.hasMoreTokens()) {
-            String acl = (String) tokenizer.nextToken();
+            String acl = tokenizer.nextToken();
 
             mAuthz.authzMgrAccessInit(mAclMethod, acl);
         }
@@ -362,7 +361,7 @@ public class AdminServlet extends HttpServlet {
                     IAuthCredentials authCreds =
                             getAuthCreds(authMgr, cert);
 
-                    token = (AuthToken) authMgr.authenticate(authCreds);
+                    token = authMgr.authenticate(authCreds);
                 } else {
                     String authToken = req.getHeader(HDR_AUTHORIZATION);
                     String b64s = authToken.substring(
@@ -826,7 +825,7 @@ public class AdminServlet extends HttpServlet {
         ByteArrayOutputStream out = new ByteArrayOutputStream(s.length());
 
         for (int i = 0; i < s.length(); i++) {
-            int c = (int) s.charAt(i);
+            int c = s.charAt(i);
 
             if (c == '+') {
                 out.write(' ');
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index 6ccfcdca9..24e701d7a 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -397,7 +397,7 @@ public class AuthAdminServlet extends AdminServlet {
                 return;
             }
             // is the manager id unique?
-            if (mAuths.getPlugins().containsKey((Object) id)) {
+            if (mAuths.getPlugins().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -653,7 +653,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // is the manager instance id unique?
-            if (mAuths.getInstances().containsKey((Object) id)) {
+            if (mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -699,7 +699,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // check if implementation exists.
             AuthMgrPlugin plugin =
-                    (AuthMgrPlugin) mAuths.getPlugins().get(implname);
+                    mAuths.getPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -916,9 +916,8 @@ public class AuthAdminServlet extends AdminServlet {
         Enumeration<String> e = mAuths.getPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-            AuthMgrPlugin value = (AuthMgrPlugin)
-                    mAuths.getPlugins().get(name);
+            String name = e.nextElement();
+            AuthMgrPlugin value = mAuths.getPlugins().get(name);
 
             if (value.isVisible()) {
                 params.put(name, value.getClassPath() + EDIT);
@@ -944,8 +943,7 @@ public class AuthAdminServlet extends AdminServlet {
                 enableStr = "disabled";
             }
 
-            AuthMgrPlugin amgrplugin = (AuthMgrPlugin)
-                    mAuths.getPlugins().get(value.getImplName());
+            AuthMgrPlugin amgrplugin = mAuths.getPlugins().get(value.getImplName());
 
             if (!amgrplugin.isVisible()) {
                 params.put(name, value.getImplName() + ";invisible;" + enableStr);
@@ -1032,7 +1030,7 @@ public class AuthAdminServlet extends AdminServlet {
             // first check if any instances from this auth manager
             // DON'T remove auth manager if any instance
             for (Enumeration<?> e = mAuths.getInstances().keys(); e.hasMoreElements();) {
-                IAuthManager authMgr = (IAuthManager) mAuths.get((String) e.nextElement());
+                IAuthManager authMgr = mAuths.get((String) e.nextElement());
 
                 if (authMgr.getImplName() == id) {
                     // store a message in the signed audit log file
@@ -1052,7 +1050,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // then delete this auth manager
-            mAuths.getPlugins().remove((Object) id);
+            mAuths.getPlugins().remove(id);
 
             IConfigStore destStore =
                     mConfig.getSubStore(DestDef.DEST_AUTH_ADMIN);
@@ -1350,7 +1348,7 @@ public class AuthAdminServlet extends AdminServlet {
             return;
         }
 
-        IAuthManager mgrInst = (IAuthManager) mAuths.get(id);
+        IAuthManager mgrInst = mAuths.get(id);
         IConfigStore config = mgrInst.getConfigStore();
         String[] configParams = mgrInst.getConfigParams();
         NameValuePairs params = new NameValuePairs();
@@ -1360,7 +1358,7 @@ public class AuthAdminServlet extends AdminServlet {
         if (configParams != null) {
             for (int i = 0; i < configParams.length; i++) {
                 String key = configParams[i];
-                String val = (String) config.get(key);
+                String val = config.get(key);
 
                 if (val != null) {
                     params.put(key, val);
@@ -1434,7 +1432,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // Does the manager instance exist?
-            if (!mAuths.getInstances().containsKey((Object) id)) {
+            if (!mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -1470,8 +1468,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // get plugin for implementation
-            AuthMgrPlugin plugin =
-                    (AuthMgrPlugin) mAuths.getPlugins().get(implname);
+            AuthMgrPlugin plugin = mAuths.getPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -1493,8 +1490,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // save old instance substore params in case new one fails.
 
-            IAuthManager oldinst =
-                    (IAuthManager) mAuths.get(id);
+            IAuthManager oldinst = mAuths.get(id);
             IConfigStore oldConfig = oldinst.getConfigStore();
 
             String[] oldConfigParms = oldinst.getConfigParams();
@@ -1502,7 +1498,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // implName is always required so always include it it.
             saveParams.put(IAuthSubsystem.PROP_PLUGIN,
-                    (String) oldConfig.get(IAuthSubsystem.PROP_PLUGIN));
+                    oldConfig.get(IAuthSubsystem.PROP_PLUGIN));
             if (oldConfigParms != null) {
                 for (int i = 0; i < oldConfigParms.length; i++) {
                     String key = oldConfigParms[i];
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 5aa422730..a47c7ae0d 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -357,7 +357,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<ISubsystem> e = CMS.getSubsystems();
 
         while (e.hasMoreElements()) {
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if ((sys instanceof IKeyRecoveryAuthority) &&
@@ -387,7 +387,7 @@ public final class CMSAdminServlet extends AdminServlet {
         boolean isKRAInstalled = false;
 
         while (e.hasMoreElements()) {
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if (sys instanceof IKeyRecoveryAuthority)
@@ -538,7 +538,7 @@ public final class CMSAdminServlet extends AdminServlet {
             boolean isKRAInstalled = false;
 
             while (e.hasMoreElements()) {
-                ISubsystem sys = (ISubsystem) e.nextElement();
+                ISubsystem sys = e.nextElement();
 
                 //get subsystem type
                 if (sys instanceof IKeyRecoveryAuthority)
@@ -563,7 +563,7 @@ public final class CMSAdminServlet extends AdminServlet {
             boolean isCACert = true;
 
             while (enum1.hasMoreElements()) {
-                String name = (String) enum1.nextElement();
+                String name = enum1.nextElement();
                 String val = req.getParameter(name);
 
                 if (name.equals(Constants.PR_CIPHER_PREF)) {
@@ -781,7 +781,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String type = "";
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if (sys instanceof IKeyRecoveryAuthority)
@@ -846,7 +846,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
 
             if (key.equals(Constants.OP_TYPE))
                 continue;
@@ -874,7 +874,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
         String newKeyName = null, selectedToken = null;
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.PR_KEY_LIST)) {
                 newKeyName = req.getParameter(name);
@@ -908,7 +908,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.PR_TOKEN_LIST)) {
                 String selectedToken = req.getParameter(name);
@@ -957,7 +957,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -1022,7 +1022,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String pwd = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_TOKEN_NAME)) {
@@ -1051,7 +1051,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String value = "";
 
         while (enum1.hasMoreElements()) {
-            key = (String) enum1.nextElement();
+            key = enum1.nextElement();
             value = req.getParameter(key);
             if (key.equals(Constants.PR_TOKEN_NAME)) {
                 break;
@@ -1105,7 +1105,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String keyCurveName = "";
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_TOKEN_NAME)) {
@@ -1472,7 +1472,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String newtokenname = null;
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (!key.equals("pathname")) {
@@ -1489,7 +1489,7 @@ public final class CMSAdminServlet extends AdminServlet {
             ICertificateAuthority ca = (ICertificateAuthority)
                     CMS.getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository repository =
-                    (ICertificateRepository) ca.getCertificateRepository();
+                    ca.getCertificateRepository();
             ISigningUnit signingUnit = ca.getSigningUnit();
             String oldtokenname = null;
             //this is the old nick name
@@ -1891,7 +1891,7 @@ public final class CMSAdminServlet extends AdminServlet {
             Enumeration<String> enum1 = req.getParameterNames();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_PKCS10))
@@ -2309,7 +2309,7 @@ public final class CMSAdminServlet extends AdminServlet {
             NameValuePairs results = new NameValuePairs();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 // really should be PR_CERT_CONTENT
@@ -2539,7 +2539,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String otherNickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_PKCS10)) {
@@ -2639,7 +2639,7 @@ public final class CMSAdminServlet extends AdminServlet {
         NameValuePairs pairs = new NameValuePairs();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2682,7 +2682,7 @@ public final class CMSAdminServlet extends AdminServlet {
         NameValuePairs pairs = new NameValuePairs();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2796,7 +2796,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String date = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2825,7 +2825,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_SUBJECT_NAME)) {
@@ -2854,7 +2854,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String curveName = null;
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_KEY_CURVENAME)) {
@@ -2885,7 +2885,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String certExt = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(ConfigConstants.PR_CERTIFICATE_EXTENSION)) {
@@ -2911,7 +2911,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String nickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.RS_ID)) {
@@ -2938,7 +2938,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String nickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_NICKNAME)) {
@@ -3025,7 +3025,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String trust = "";
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.RS_ID)) {
@@ -3129,7 +3129,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String logMessage = null;
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_RUN_SELFTESTS_ON_DEMAND)) {
@@ -3222,8 +3222,7 @@ public final class CMSAdminServlet extends AdminServlet {
                         throw new EMissingSelfTestException();
                     }
 
-                    ISelfTest test = (ISelfTest)
-                            mSelfTestSubsystem.getSelfTest(instanceName);
+                    ISelfTest test = mSelfTestSubsystem.getSelfTest(instanceName);
 
                     if (test == null) {
                         // self test plugin instance property name is not present
diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index a89933c69..47eeebe92 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
@@ -109,7 +109,7 @@ public class JobsAdminServlet extends AdminServlet {
         Object impl = null;
 
         JobPlugin jp =
-                (JobPlugin) mJobsSched.getPlugins().get(implName);
+                mJobsSched.getPlugins().get(implName);
 
         if (jp != null)
             impl = getClassByNameAsExtendedPluginInfo(jp.getClassPath());
@@ -288,7 +288,7 @@ public class JobsAdminServlet extends AdminServlet {
             return;
         }
         // is the job plugin id unique?
-        if (mJobsSched.getPlugins().containsKey((Object) id)) {
+        if (mJobsSched.getPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new EJobsException(CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_PLUGIN_ID", id))
                             .toString(),
@@ -384,7 +384,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // is the job instance id unique?
-        if (mJobsSched.getInstances().containsKey((Object) id)) {
+        if (mJobsSched.getInstances().containsKey(id)) {
             sendResponse(ERROR,
                     CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"),
                     null, resp);
@@ -405,7 +405,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         JobPlugin plugin =
-                (JobPlugin) mJobsSched.getPlugins().get(implname);
+                mJobsSched.getPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -541,7 +541,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         for (Enumeration<String> e = mJobsSched.getInstances().keys(); e.hasMoreElements();) {
             String name = e.nextElement();
-            IJob value = mJobsSched.getInstances().get((Object) name);
+            IJob value = mJobsSched.getInstances().get(name);
 
             //				params.add(name, value.getImplName());
             params.put(name, value.getImplName() + VISIBLE +
@@ -591,7 +591,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // then delete this job plugin
-        mJobsSched.getPlugins().remove((Object) id);
+        mJobsSched.getPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(DestDef.DEST_JOBS_ADMIN);
@@ -723,7 +723,7 @@ public class JobsAdminServlet extends AdminServlet {
             return;
         }
 
-        IJob jobInst = (IJob) mJobsSched.getInstances().get(id);
+        IJob jobInst = mJobsSched.getInstances().get(id);
         IConfigStore config = jobInst.getConfigStore();
         String[] configParams = jobInst.getConfigParams();
         NameValuePairs params = new NameValuePairs();
@@ -735,7 +735,7 @@ public class JobsAdminServlet extends AdminServlet {
             for (int i = 0; i < configParams.length; i++) {
                 String key = configParams[i];
 
-                String val = (String) config.get(key);
+                String val = config.get(key);
 
                 if (val != null && !val.equals("")) {
                     params.put(key, val);
@@ -774,7 +774,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // Does the job instance exist?
-        if (!mJobsSched.getInstances().containsKey((Object) id)) {
+        if (!mJobsSched.getInstances().containsKey(id)) {
             sendResponse(ERROR,
                     CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"),
                     null, resp);
@@ -793,7 +793,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         JobPlugin plugin =
-                (JobPlugin) mJobsSched.getPlugins().get(implname);
+                mJobsSched.getPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -806,7 +806,7 @@ public class JobsAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         IJob oldinst =
-                (IJob) mJobsSched.getInstances().get((Object) id);
+                mJobsSched.getInstances().get(id);
         IConfigStore oldConfig = oldinst.getConfigStore();
 
         String[] oldConfigParms = oldinst.getConfigParams();
@@ -814,7 +814,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // implName is always required so always include it it.
         saveParams.put(IJobsScheduler.PROP_PLUGIN,
-                (String) oldConfig.get(IJobsScheduler.PROP_PLUGIN));
+                oldConfig.get(IJobsScheduler.PROP_PLUGIN));
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.length; i++) {
                 String key = oldConfigParms[i];
diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index fb73cec98..9600c5e56 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -342,14 +342,13 @@ public class LogAdminServlet extends AdminServlet {
         Enumeration<String> e = mSys.getLogInsts().keys();
 
         for (; e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILogEventListener value = ((ILogSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_LOG)).getLogInstance(name);
 
             if (value == null)
                 continue;
             String pName = mSys.getLogPluginName(value);
-            LogPlugin pClass = (LogPlugin)
-                    mSys.getLogPlugins().get(pName);
+            LogPlugin pClass = mSys.getLogPlugins().get(pName);
             String c = pClass.getClassPath();
 
             // not show ntEventlog here
@@ -381,7 +380,7 @@ public class LogAdminServlet extends AdminServlet {
     private NameValuePairs getExtendedPluginInfo(Locale locale, String implType, String implName) {
         IExtendedPluginInfo ext_info = null;
         Object impl = null;
-        LogPlugin lp = (LogPlugin) mSys.getLogPlugins().get(implName);
+        LogPlugin lp = mSys.getLogPlugins().get(implName);
 
         if (lp != null) {
             impl = getClassByNameAsExtendedPluginInfo(lp.getClassPath());
@@ -460,7 +459,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // is the log id unique?
-            if (mSys.getLogPlugins().containsKey((Object) id)) {
+            if (mSys.getLogPlugins().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -746,7 +745,7 @@ public class LogAdminServlet extends AdminServlet {
                 return;
             }
 
-            if (mSys.getLogInsts().containsKey((Object) id)) {
+            if (mSys.getLogInsts().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -788,8 +787,8 @@ public class LogAdminServlet extends AdminServlet {
 
             // check if implementation exists.
             LogPlugin plugin =
-                    (LogPlugin) mSys.getLogPlugins().get(
-                            implname);
+                    mSys.getLogPlugins().get(
+                    implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -821,7 +820,7 @@ public class LogAdminServlet extends AdminServlet {
 
             if (configParams != null) {
                 for (int i = 0; i < configParams.size(); i++) {
-                    String kv = (String) configParams.elementAt(i);
+                    String kv = configParams.elementAt(i);
                     int index = kv.indexOf('=');
                     String val = req.getParameter(kv.substring(0, index));
 
@@ -1036,9 +1035,8 @@ public class LogAdminServlet extends AdminServlet {
         Enumeration<String> e = mSys.getLogPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-            LogPlugin value = (LogPlugin)
-                    mSys.getLogPlugins().get(name);
+            String name = e.nextElement();
+            LogPlugin value = mSys.getLogPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1308,7 +1306,7 @@ public class LogAdminServlet extends AdminServlet {
             // first check if any instances from this log
             // DON'T remove log if any instance
             for (Enumeration<String> e = mSys.getLogInsts().keys(); e.hasMoreElements();) {
-                String name = (String) e.nextElement();
+                String name = e.nextElement();
                 ILogEventListener log = mSys.getLogInstance(name);
 
                 if (getLogPluginName(log) == id) {
@@ -1331,7 +1329,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // then delete this log
-            mSys.getLogPlugins().remove((Object) id);
+            mSys.getLogPlugins().remove(id);
 
             IConfigStore destStore =
                     mConfig.getSubStore("log");
@@ -1494,7 +1492,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // Does the manager instance exist?
-            if (!mSys.getLogInsts().containsKey((Object) id)) {
+            if (!mSys.getLogInsts().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -1535,7 +1533,7 @@ public class LogAdminServlet extends AdminServlet {
             }
             // get plugin for implementation
             LogPlugin plugin =
-                    (LogPlugin) mSys.getLogPlugins().get(implname);
+                    mSys.getLogPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -1559,7 +1557,7 @@ public class LogAdminServlet extends AdminServlet {
             // save old instance substore params in case new one fails.
 
             ILogEventListener oldinst =
-                    (ILogEventListener) mSys.getLogInstance(id);
+                    mSys.getLogInstance(id);
             Vector<String> oldConfigParms = oldinst.getInstanceParams();
             NameValuePairs saveParams = new NameValuePairs();
 
@@ -1567,7 +1565,7 @@ public class LogAdminServlet extends AdminServlet {
             saveParams.put("pluginName", implname);
             if (oldConfigParms != null) {
                 for (int i = 0; i < oldConfigParms.size(); i++) {
-                    String kv = (String) oldConfigParms.elementAt(i);
+                    String kv = oldConfigParms.elementAt(i);
                     int index = kv.indexOf('=');
 
                     saveParams.put(kv.substring(0, index),
@@ -1629,7 +1627,7 @@ public class LogAdminServlet extends AdminServlet {
                 for (int i = 0; i < configParams.size(); i++) {
                     AUTHZ_RES_NAME =
                             "certServer.log.configuration";
-                    String kv = (String) configParams.elementAt(i);
+                    String kv = configParams.elementAt(i);
                     int index = kv.indexOf('=');
                     String key = kv.substring(0, index);
                     String val = req.getParameter(key);
@@ -2209,7 +2207,7 @@ public class LogAdminServlet extends AdminServlet {
         params.put(Constants.PR_LOG_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 if (index == -1) {
@@ -2246,8 +2244,7 @@ public class LogAdminServlet extends AdminServlet {
             return;
         }
 
-        ILogEventListener logInst = (ILogEventListener)
-                mSys.getLogInstance(id);
+        ILogEventListener logInst = mSys.getLogInstance(id);
         Vector<String> configParams = logInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2256,7 +2253,7 @@ public class LogAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
index 4149fae94..a7c2c6c50 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
@@ -493,7 +493,7 @@ public class OCSPAdminServlet extends AdminServlet {
             Enumeration<String> enum1 = req.getParameterNames();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_DEFAULT_ALGORITHM)) {
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index 3ca222135..19677e748 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
@@ -384,7 +384,7 @@ public class ProfileAdminServlet extends AdminServlet {
         NameValuePairs nvp = new NameValuePairs();
 
         while (impls.hasMoreElements()) {
-            String id = (String) impls.nextElement();
+            String id = impls.nextElement();
             IPluginInfo info = mRegistry.getPluginInfo("profile", id);
 
             nvp.put(id, info.getClassName() + "," +
@@ -1057,7 +1057,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1206,7 +1206,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1481,7 +1481,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1610,7 +1610,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1730,7 +1730,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1855,7 +1855,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             CMS.debug("ProfileAdminServlet: modifyPolicyConstraintConfig policy " + policy + " con " + con);
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -2056,11 +2056,11 @@ public class ProfileAdminServlet extends AdminServlet {
             return;
         }
         while (setIds.hasMoreElements()) {
-            String setId = (String) setIds.nextElement();
+            String setId = setIds.nextElement();
             Enumeration<ProfilePolicy> policies = profile.getProfilePolicies(setId);
 
             while (policies.hasMoreElements()) {
-                IProfilePolicy policy = (IProfilePolicy) policies.nextElement();
+                IProfilePolicy policy = policies.nextElement();
                 IPolicyDefault def = policy.getDefault();
                 IPolicyConstraint con = policy.getConstraint();
 
@@ -2091,7 +2091,7 @@ public class ProfileAdminServlet extends AdminServlet {
         Enumeration<String> outputs = profile.getProfileOutputIds();
 
         while (outputs.hasMoreElements()) {
-            String outputId = (String) outputs.nextElement();
+            String outputId = outputs.nextElement();
             IProfileOutput output = profile.getProfileOutput(outputId);
 
             nvp.put(outputId, output.getName(getLocale(req)));
@@ -2118,7 +2118,7 @@ public class ProfileAdminServlet extends AdminServlet {
         Enumeration<String> inputs = profile.getProfileInputIds();
 
         while (inputs.hasMoreElements()) {
-            String inputId = (String) inputs.nextElement();
+            String inputId = inputs.nextElement();
             IProfileInput input = profile.getProfileInput(inputId);
 
             nvp.put(inputId, input.getName(getLocale(req)));
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 8daadbce0..adbdc8279 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -345,7 +345,7 @@ public class PublisherAdminServlet extends AdminServlet {
         StringBuffer publish = new StringBuffer();
 
         for (; publishers.hasMoreElements();) {
-            String name = (String) publishers.nextElement();
+            String name = publishers.nextElement();
 
             publish.append(",");
             publish.append(name);
@@ -379,14 +379,14 @@ public class PublisherAdminServlet extends AdminServlet {
             impl = getExtendedPluginInfo(p_processor);
         } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_MAPPER)) {
             IPublisherProcessor p_processor = mProcessor;
-            Plugin plugin = (Plugin) p_processor.getMapperPlugins().get(implName
+            Plugin plugin = p_processor.getMapperPlugins().get(implName
                     );
 
             impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
 
         } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER)) {
             IPublisherProcessor p_processor = mProcessor;
-            Plugin plugin = (Plugin) p_processor.getPublisherPlugins().get(implName);
+            Plugin plugin = p_processor.getPublisherPlugins().get(implName);
 
             impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
         }
@@ -1018,7 +1018,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the manager id unique?
-        if (mProcessor.getMapperPlugins().containsKey((Object) id)) {
+        if (mProcessor.getMapperPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id))
                             .toString(),
@@ -1119,7 +1119,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getMapperInsts().containsKey((Object) id)) {
+        if (mProcessor.getMapperInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1136,8 +1136,8 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         MapperPlugin plugin =
-                (MapperPlugin) mProcessor.getMapperPlugins().get(
-                        implname);
+                mProcessor.getMapperPlugins().get(
+                implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1156,7 +1156,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String val = req.getParameter(kv.substring(0, index));
 
@@ -1248,8 +1248,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            MapperPlugin value = (MapperPlugin)
-                    mProcessor.getMapperPlugins().get(name);
+            MapperPlugin value = mProcessor.getMapperPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1372,7 +1371,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // first check if any instances from this mapper
         // DON'T remove mapper if any instance
         for (Enumeration<String> e = mProcessor.getMapperInsts().keys(); e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILdapMapper mapper = mProcessor.getMapperInstance(name);
 
             if (id.equals(getMapperPluginName(mapper))) {
@@ -1382,7 +1381,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this mapper
-        mProcessor.getMapperPlugins().remove((Object) id);
+        mProcessor.getMapperPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(
@@ -1459,8 +1458,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapMapper mapperInst = (ILdapMapper)
-                mProcessor.getMapperInstance(id);
+        ILdapMapper mapperInst = mProcessor.getMapperInstance(id);
         Vector<String> configParams = mapperInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -1496,7 +1494,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getMapperInsts().containsKey((Object) id)) {
+        if (!mProcessor.getMapperInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1511,7 +1509,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
         // get plugin for implementation
         MapperPlugin plugin =
-                (MapperPlugin) mProcessor.getMapperPlugins().get(implname);
+                mProcessor.getMapperPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1525,7 +1523,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         ILdapMapper oldinst =
-                (ILdapMapper) mProcessor.getMapperInstance(id);
+                mProcessor.getMapperInstance(id);
         Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
@@ -1659,7 +1657,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the rule id unique?
-        if (mProcessor.getRulePlugins().containsKey((Object) id)) {
+        if (mProcessor.getRulePlugins().containsKey(id)) {
             sendResponse(
                     ERROR,
                     new ELdapException(CMS.getUserMessage("CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(getLocale(req)),
@@ -1750,7 +1748,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getRuleInsts().containsKey((Object) id)) {
+        if (mProcessor.getRuleInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1767,8 +1765,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         RulePlugin plugin =
-                (RulePlugin) mProcessor.getRulePlugins().get(
-                        implname);
+                mProcessor.getRulePlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1884,8 +1881,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            RulePlugin value = (RulePlugin)
-                    mProcessor.getRulePlugins().get(name);
+            RulePlugin value = mProcessor.getRulePlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1911,8 +1907,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         for (; e.hasMoreElements();) {
             String name = e.nextElement();
-            ILdapRule value = (ILdapRule)
-                    mProcessor.getRuleInsts().get((Object) name);
+            ILdapRule value = mProcessor.getRuleInsts().get(name);
             String enabled = value.enabled() ? "enabled" : "disabled";
 
             params.put(name, value.getInstanceName() + ";visible;" + enabled);
@@ -1966,7 +1961,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this rule
-        mProcessor.getRulePlugins().remove((Object) id);
+        mProcessor.getRulePlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(
@@ -2058,7 +2053,7 @@ public class PublisherAdminServlet extends AdminServlet {
         params.put(Constants.PR_RULE_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2090,8 +2085,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapRule ruleInst = (ILdapRule)
-                mProcessor.getRuleInsts().get(id);
+        ILdapRule ruleInst = mProcessor.getRuleInsts().get(id);
         Vector<String> configParams = ruleInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2100,7 +2094,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2126,7 +2120,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getRuleInsts().containsKey((Object) id)) {
+        if (!mProcessor.getRuleInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2142,7 +2136,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         RulePlugin plugin =
-                (RulePlugin) mProcessor.getRulePlugins().get(implname);
+                mProcessor.getRulePlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -2155,7 +2149,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         ILdapRule oldinst =
-                (ILdapRule) mProcessor.getRuleInsts().get((Object) id);
+                mProcessor.getRuleInsts().get(id);
         Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
@@ -2293,7 +2287,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the manager id unique?
-        if (mProcessor.getPublisherPlugins().containsKey((Object) id)) {
+        if (mProcessor.getPublisherPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id))
                             .toString(),
@@ -2386,7 +2380,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getPublisherInsts().containsKey((Object) id)) {
+        if (mProcessor.getPublisherInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2403,8 +2397,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         PublisherPlugin plugin =
-                (PublisherPlugin) mProcessor.getPublisherPlugins().get(
-                        implname);
+                mProcessor.getPublisherPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -2530,8 +2523,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            PublisherPlugin value = (PublisherPlugin)
-                    mProcessor.getPublisherPlugins().get(name);
+            PublisherPlugin value = mProcessor.getPublisherPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -2617,7 +2609,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this publisher
-        mProcessor.getPublisherPlugins().remove((Object) id);
+        mProcessor.getPublisherPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
@@ -2719,7 +2711,7 @@ public class PublisherAdminServlet extends AdminServlet {
         params.put(Constants.PR_PUBLISHER_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 if (index == -1) {
@@ -2757,8 +2749,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapPublisher publisherInst = (ILdapPublisher)
-                mProcessor.getPublisherInstance(id);
+        ILdapPublisher publisherInst = mProcessor.getPublisherInstance(id);
         Vector<String> configParams = publisherInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2767,7 +2758,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2804,7 +2795,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getPublisherInsts().containsKey((Object) id)) {
+        if (!mProcessor.getPublisherInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2820,7 +2811,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         PublisherPlugin plugin =
-                (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname);
+                mProcessor.getPublisherPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -2842,7 +2833,7 @@ public class PublisherAdminServlet extends AdminServlet {
         saveParams.put("pluginName", implname);
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.size(); i++) {
-                String kv = (String) oldConfigParms.elementAt(i);
+                String kv = oldConfigParms.elementAt(i);
                 int index = kv.indexOf('=');
                 if (index > -1) {
                     if (kv.substring(0, index).equalsIgnoreCase("caObjectClass")) {
@@ -2885,7 +2876,7 @@ public class PublisherAdminServlet extends AdminServlet {
         substore.put("pluginName", implname);
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String key = kv.substring(0, index);
                 String val = req.getParameter(key);
@@ -2995,7 +2986,7 @@ public class PublisherAdminServlet extends AdminServlet {
                 extras.add(list1[i].trim());
         }
 
-        return (String[]) extras.toArray(new String[extras.size()]);
+        return extras.toArray(new String[extras.size()]);
     }
 
     // convenience function - takes list1, list2.  Concatenates the two
@@ -3018,7 +3009,7 @@ public class PublisherAdminServlet extends AdminServlet {
                 sum.add(list2[i].trim());
         }
 
-        return (String[]) sum.toArray(new String[sum.size()]);
+        return sum.toArray(new String[sum.size()]);
     }
 
     // convenience funtion. Takes a string array and delimiter
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
index 4f5afbb20..487fd9f2e 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
@@ -277,7 +277,7 @@ public class RegistryAdminServlet extends AdminServlet {
                 Enumeration<String> impls = mRegistry.getIds("constraintPolicy");
 
                 while (impls.hasMoreElements()) {
-                    String constraintID = (String) impls.nextElement();
+                    String constraintID = impls.nextElement();
                     IPluginInfo constraintInfo = mRegistry.getPluginInfo(
                             "constraintPolicy", constraintID);
                     IPolicyConstraint policyConstraintClass = (IPolicyConstraint)
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index 90dc92221..2cd337123 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
@@ -506,7 +506,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         }
 
         X509Certificate[] certs =
-                (X509Certificate[]) user.getX509Certificates();
+                user.getX509Certificates();
 
         if (certs != null) {
             for (int i = 0; i < certs.length; i++) {
@@ -1548,7 +1548,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             }
 
             while (e.hasMoreElements()) {
-                IGroup group = (IGroup) e.nextElement();
+                IGroup group = e.nextElement();
 
                 if (group.isMember(id) == true) {
                     if (mustDelete) {
@@ -1697,9 +1697,9 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     Constants.PR_GROUP_DESC);
 
             if (desc != null) {
-                group.set("description", (Object) desc);
+                group.set("description", desc);
             } else {
-                group.set("description", (Object) "");
+                group.set("description", "");
             }
 
             if (members != null) {
@@ -1941,7 +1941,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     Constants.PR_GROUP_DESC);
 
             if (desc != null) {
-                group.set("description", (Object) desc);
+                group.set("description", desc);
             }
 
             String members = super.getParameter(req, Constants.PR_GROUP_USER);
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index f1de3ce4a..97573d877 100644
--- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -329,7 +329,7 @@ public abstract class CMSServlet extends HttpServlet {
             Enumeration<CMSLoadTemplate> templs = mTemplates.elements();
 
             while (templs.hasMoreElements()) {
-                CMSLoadTemplate templ = (CMSLoadTemplate) templs.nextElement();
+                CMSLoadTemplate templ = templs.nextElement();
 
                 if (templ == null || templ.mPropName == null) {
                     continue;
@@ -495,16 +495,16 @@ public abstract class CMSServlet extends HttpServlet {
                 CMS.debug(CMS.DEBUG_INFORM, "CMSServlet: curDate="
                         + endDate + " id=" + mId + " time=" + (endTime - startTime));
             }
-            iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this);
+            iCommandQueue.unRegisterProccess(cmsRequest, this);
         } catch (EBaseException e) {
-            iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this);
+            iCommandQueue.unRegisterProccess(cmsRequest, this);
             // ByteArrayOutputStream os = new ByteArrayOutputStream(); for debugging only
             // PrintStream ps = new PrintStream(os);
             //e.printStackTrace(ps);
             log(e.toString());
             renderException(cmsRequest, e);
         } catch (Exception ex) {
-            iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this);
+            iCommandQueue.unRegisterProccess(cmsRequest, this);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             PrintStream ps = new PrintStream(os);
 
@@ -554,7 +554,7 @@ public abstract class CMSServlet extends HttpServlet {
             return;
         Integer status = cmsReq.getStatus();
 
-        CMSLoadTemplate ltempl = (CMSLoadTemplate) mTemplates.get(status);
+        CMSLoadTemplate ltempl = mTemplates.get(status);
 
         if (ltempl == null || ltempl.mTemplateName == null) {
             // result is previously outputed.
@@ -575,7 +575,7 @@ public abstract class CMSServlet extends HttpServlet {
         if (argBlock != null) {
             Enumeration<String> names = argBlock.getElements();
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
                 String val = argBlock.get(name).toString();
                 val = val.trim();
                 xmlObj.addItemToContainer(argBlockContainer, name, val);
@@ -596,7 +596,7 @@ public abstract class CMSServlet extends HttpServlet {
             Node recordsNode = xmlObj.createContainer(root, "records");
             if (records != null) {
                 while (records.hasMoreElements()) {
-                    IArgBlock record = (IArgBlock) records.nextElement();
+                    IArgBlock record = records.nextElement();
                     outputArgBlockAsXML(xmlObj, recordsNode, "record", record);
                 }
             }
@@ -697,7 +697,7 @@ public abstract class CMSServlet extends HttpServlet {
         try {
             Locale[] locale = new Locale[1];
             CMSLoadTemplate loadTempl =
-                    (CMSLoadTemplate) mTemplates.get(CMSRequest.EXCEPTION);
+                    mTemplates.get(CMSRequest.EXCEPTION);
             CMSTemplate template = getTemplate(loadTempl.mTemplateName,
                     cmsReq.getHttpReq(), locale);
             ICMSTemplateFiller filler = loadTempl.mFiller;
diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
index 4d7ff24f5..c34840588 100644
--- a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
@@ -205,7 +205,7 @@ class ProxyWrapper extends HttpServletRequestWrapper {
                     String[] values = me.getValue();
                     String newname = null;
                     if (name != null) {
-                        newname = (String) mMap.get(name);
+                        newname = mMap.get(name);
                     }
 
                     // No mapping specified, just use existing name/value
@@ -217,7 +217,7 @@ class ProxyWrapper extends HttpServletRequestWrapper {
                         if (o == null) {
                             n.put(newname, values);
                         } else {
-                            String newvalues[] = (String[]) mValueMap.get(newname);
+                            String newvalues[] = mValueMap.get(newname);
                             n.put(newname, newvalues);
                         }
                     }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index fc9a97be2..ad818d89b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
@@ -404,7 +404,7 @@ public class CMCRevReqServlet extends CMSServlet {
             }
 
             if (mAuthority instanceof ICertificateAuthority) {
-                ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList(
+                ICertRecordList list = mCertDB.findCertRecordsInList(
                         revokeAll, null, totalRecordCount);
                 Enumeration<ICertRecord> e = list.getCertRecords(0, totalRecordCount - 1);
 
@@ -471,7 +471,7 @@ public class CMCRevReqServlet extends CMSServlet {
 
                         for (int j = 0; j < serialNumbers.size(); j++) {
                             if (certs[i].getSerialNumber().toString().equals(
-                                    (String) serialNumbers.elementAt(j))) {
+                                    serialNumbers.elementAt(j))) {
                                 addToList = true;
                                 break;
                             }
@@ -523,8 +523,8 @@ public class CMCRevReqServlet extends CMSServlet {
             RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count];
 
             for (int i = 0; i < count; i++) {
-                oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i);
-                revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i);
+                oldCerts[i] = oldCertsV.elementAt(i);
+                revCertImpls[i] = revCertImplsV.elementAt(i);
             }
 
             IRequest revReq =
@@ -658,8 +658,7 @@ public class CMCRevReqServlet extends CMSServlet {
                             ((ICertificateAuthority) mAuthority).getCRLIssuingPoints();
 
                     while (otherCRLs.hasMoreElements()) {
-                        ICRLIssuingPoint crl = (ICRLIssuingPoint)
-                                otherCRLs.nextElement();
+                        ICRLIssuingPoint crl = otherCRLs.nextElement();
                         String crlId = crl.getId();
 
                         if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL))
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index 94c8f1207..e820bb87a 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
@@ -332,7 +332,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
             }
 
             if (mAuthority instanceof ICertificateAuthority) {
-                ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList(
+                ICertRecordList list = mCertDB.findCertRecordsInList(
                         revokeAll, null, totalRecordCount);
                 Enumeration<ICertRecord> e = list.getCertRecords(0, totalRecordCount - 1);
 
@@ -399,7 +399,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
 
                         for (int j = 0; j < serialNumbers.size(); j++) {
                             if (certs[i].getSerialNumber().toString().equals(
-                                    (String) serialNumbers.elementAt(j))) {
+                                    serialNumbers.elementAt(j))) {
                                 addToList = true;
                                 break;
                             }
@@ -451,8 +451,8 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
             RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count];
 
             for (int i = 0; i < count; i++) {
-                oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i);
-                revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i);
+                oldCerts[i] = oldCertsV.elementAt(i);
+                revCertImpls[i] = revCertImplsV.elementAt(i);
             }
 
             IRequest revReq =
@@ -566,8 +566,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
                             ((ICertificateAuthority) mAuthority).getCRLIssuingPoints();
 
                     while (otherCRLs.hasMoreElements()) {
-                        ICRLIssuingPoint crl = (ICRLIssuingPoint)
-                                otherCRLs.nextElement();
+                        ICRLIssuingPoint crl = otherCRLs.nextElement();
                         String crlId = crl.getId();
 
                         if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL))
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
index 46863c098..8794143fa 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
@@ -104,7 +104,7 @@ public class DisableEnrollResult extends CMSServlet {
         X509Certificate sslClientCert = null;
 
         sslClientCert = getSSLClientCertificate(httpReq);
-        String dn = (String) sslClientCert.getSubjectDN().toString();
+        String dn = sslClientCert.getSubjectDN().toString();
 
         // Construct an ArgBlock
         IArgBlock args = cmsReq.getHttpParams();
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index 105fc66a1..1e1ee44f1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
@@ -251,7 +251,7 @@ public class DisplayBySerial extends CMSServlet {
             Locale locale)
             throws EBaseException {
         try {
-            ICertRecord rec = (ICertRecord) mCertDB.readCertificateRecord(seq);
+            ICertRecord rec = mCertDB.readCertificateRecord(seq);
             if (rec == null) {
                 CMS.debug("DisplayBySerial: failed to read record");
                 throw new ECMSGWException(
@@ -277,7 +277,7 @@ public class DisplayBySerial extends CMSServlet {
 
                 if (extensions != null) {
                     for (int i = 0; i < extensions.size(); i++) {
-                        Extension ext = (Extension) extensions.elementAt(i);
+                        Extension ext = extensions.elementAt(i);
 
                         if (ext instanceof NSCertTypeExtension) {
                             NSCertTypeExtension type = (NSCertTypeExtension) ext;
@@ -336,7 +336,7 @@ public class DisplayBySerial extends CMSServlet {
                     int reason = 0;
 
                     while (enumx.hasMoreElements()) {
-                        Extension ext = (Extension) enumx.nextElement();
+                        Extension ext = enumx.nextElement();
 
                         if (ext instanceof CRLReasonExtension) {
                             reason = ((CRLReasonExtension) ext).getReason().toInt();
@@ -454,7 +454,7 @@ public class DisplayBySerial extends CMSServlet {
         ICertRecord rec = null;
 
         try {
-            rec = (ICertRecord) mCertDB.readCertificateRecord(seq);
+            rec = mCertDB.readCertificateRecord(seq);
             X509CertImpl x509cert = rec.getCertificate();
 
             if (x509cert != null) {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index 61a606cae..af91b1cb3 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -245,7 +245,7 @@ public class DisplayCRL extends CMSServlet {
 
         try {
             crlRecord =
-                    (ICRLIssuingPointRecord) mCA.getCRLRepository().readCRLIssuingPointRecord(crlIssuingPointId);
+                    mCA.getCRLRepository().readCRLIssuingPointRecord(crlIssuingPointId);
         } catch (EBaseException e) {
             header.addStringValue("error", e.toString(locale));
             return;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index afd958abf..8e5df2c14 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
@@ -227,7 +227,7 @@ public class DoRevoke extends CMSServlet {
                     certChain[0] = cert2;
                     IUser user = null;
                     try {
-                        user = (IUser) mUL.locateUser(new Certificates(certChain));
+                        user = mUL.locateUser(new Certificates(certChain));
                     } catch (Exception e) {
                         CMS.debug("DoRevoke:  Failed to map certificate '" +
                                    cert2.getSubjectDN().getName() + "' to user.");
@@ -565,7 +565,7 @@ public class DoRevoke extends CMSServlet {
 
                         for (int j = 0; j < serialNumbers.size(); j++) {
                             //xxxxx serial number in decimal?
-                            if (certs[i].getSerialNumber().toString().equals((String) serialNumbers.elementAt(j)) &&
+                            if (certs[i].getSerialNumber().toString().equals(serialNumbers.elementAt(j)) &&
                                     eeSubjectDN != null && eeSubjectDN.equals(certs[i].getSubjectDN().toString())) {
                                 addToList = true;
                                 break;
@@ -658,8 +658,8 @@ public class DoRevoke extends CMSServlet {
             RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count];
 
             for (int i = 0; i < count; i++) {
-                oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i);
-                revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i);
+                oldCerts[i] = oldCertsV.elementAt(i);
+                revCertImpls[i] = revCertImplsV.elementAt(i);
             }
 
             IRequest revReq =
@@ -722,7 +722,7 @@ public class DoRevoke extends CMSServlet {
                                 //cmsReq.setErrorDescription(err);
                                 for (int j = 0; j < count; j++) {
                                     if (oldCerts[j] instanceof X509CertImpl) {
-                                        X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                                        X509CertImpl cert = oldCerts[j];
 
                                         if (oldCerts[j] != null) {
                                             mLogger.log(ILogger.EV_AUDIT,
@@ -776,7 +776,7 @@ public class DoRevoke extends CMSServlet {
                 for (int j = 0; j < count; j++) {
                     if (oldCerts[j] != null) {
                         if (oldCerts[j] instanceof X509CertImpl) {
-                            X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                            X509CertImpl cert = oldCerts[j];
 
                             mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER,
                                     AuditFormat.LEVEL,
@@ -837,8 +837,7 @@ public class DoRevoke extends CMSServlet {
                             ((ICertificateAuthority) mAuthority).getCRLIssuingPoints();
 
                     while (otherCRLs.hasMoreElements()) {
-                        ICRLIssuingPoint crl = (ICRLIssuingPoint)
-                                otherCRLs.nextElement();
+                        ICRLIssuingPoint crl = otherCRLs.nextElement();
                         String crlId = crl.getId();
 
                         if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL))
@@ -944,7 +943,7 @@ public class DoRevoke extends CMSServlet {
                 for (int j = 0; j < count; j++) {
                     if (oldCerts[j] != null) {
                         if (oldCerts[j] instanceof X509CertImpl) {
-                            X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                            X509CertImpl cert = oldCerts[j];
 
                             mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER,
                                     AuditFormat.LEVEL,
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index 83cefa6f6..f16ce2526 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
@@ -380,7 +380,7 @@ public class DoRevokeTPS extends CMSServlet {
             boolean alreadyRevokedCertFound = false;
             boolean badCertsRequested = false;
             while (e != null && e.hasMoreElements()) {
-                ICertRecord rec = (ICertRecord) e.nextElement();
+                ICertRecord rec = e.nextElement();
 
                 if (rec == null) {
                     badCertsRequested = true;
@@ -460,8 +460,8 @@ public class DoRevokeTPS extends CMSServlet {
             RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count];
 
             for (int i = 0; i < count; i++) {
-                oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i);
-                revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i);
+                oldCerts[i] = oldCertsV.elementAt(i);
+                revCertImpls[i] = revCertImplsV.elementAt(i);
             }
 
             IRequest revReq =
@@ -525,7 +525,7 @@ public class DoRevokeTPS extends CMSServlet {
                                 //cmsReq.setErrorDescription(err);
                                 for (int j = 0; j < count; j++) {
                                     if (oldCerts[j] instanceof X509CertImpl) {
-                                        X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                                        X509CertImpl cert = oldCerts[j];
 
                                         if (oldCerts[j] != null) {
                                             mLogger.log(ILogger.EV_AUDIT,
@@ -579,7 +579,7 @@ public class DoRevokeTPS extends CMSServlet {
                 for (int j = 0; j < count; j++) {
                     if (oldCerts[j] != null) {
                         if (oldCerts[j] instanceof X509CertImpl) {
-                            X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                            X509CertImpl cert = oldCerts[j];
 
                             mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER,
                                     AuditFormat.LEVEL,
@@ -634,8 +634,7 @@ public class DoRevokeTPS extends CMSServlet {
                             ((ICertificateAuthority) mAuthority).getCRLIssuingPoints();
 
                     while (otherCRLs.hasMoreElements()) {
-                        ICRLIssuingPoint crl = (ICRLIssuingPoint)
-                                otherCRLs.nextElement();
+                        ICRLIssuingPoint crl = otherCRLs.nextElement();
                         String crlId = crl.getId();
 
                         if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL))
@@ -725,7 +724,7 @@ public class DoRevokeTPS extends CMSServlet {
                 for (int j = 0; j < count; j++) {
                     if (oldCerts[j] != null) {
                         if (oldCerts[j] instanceof X509CertImpl) {
-                            X509CertImpl cert = (X509CertImpl) oldCerts[j];
+                            X509CertImpl cert = oldCerts[j];
 
                             mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER,
                                     AuditFormat.LEVEL,
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index cd9a0196b..6f1346c68 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
@@ -602,7 +602,7 @@ public class DoUnrevoke extends CMSServlet {
 
         BigInteger[] biNumbers = new BigInteger[biList.size()];
         for (int i = 0; i < biList.size(); i++) {
-            biNumbers[i] = (BigInteger) biList.elementAt(i);
+            biNumbers[i] = biList.elementAt(i);
         }
 
         return biNumbers;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index e56eece2c..de5f075ba 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
@@ -549,7 +549,7 @@ public class DoUnrevokeTPS extends CMSServlet {
 
         BigInteger[] biNumbers = new BigInteger[biList.size()];
         for (int i = 0; i < biList.size(); i++) {
-            biNumbers[i] = (BigInteger) biList.elementAt(i);
+            biNumbers[i] = biList.elementAt(i);
         }
 
         return biNumbers;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
index cbb233251..5adf9f9f1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
@@ -109,7 +109,7 @@ public class EnableEnrollResult extends CMSServlet {
         X509Certificate sslClientCert = null;
 
         sslClientCert = getSSLClientCertificate(httpReq);
-        String dn = (String) sslClientCert.getSubjectDN().toString();
+        String dn = sslClientCert.getSubjectDN().toString();
 
         // Construct an ArgBlock
         IArgBlock args = cmsReq.getHttpParams();
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 50eaaa94b..90d37f15a 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -403,11 +403,11 @@ public class EnrollServlet extends CMSServlet {
 
     private boolean checkClientCertSigningOnly(X509Certificate sslClientCert)
             throws EBaseException {
-        if ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+        if ((CMS.isSigningCert(sslClientCert) ==
                 false) ||
-                ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+                ((CMS.isSigningCert(sslClientCert) ==
                     true) &&
-                (CMS.isEncryptionCert((X509CertImpl) sslClientCert) ==
+                (CMS.isEncryptionCert(sslClientCert) ==
                     true))) {
 
             // either it's not a signing cert, or it's a dual cert
@@ -470,7 +470,7 @@ public class EnrollServlet extends CMSServlet {
                         + certBasedOldSubjectDN + ")(!(x509cert.serialNumber=" + certBasedOldSerialNum
                         + "))(certStatus=VALID))";
         ICertRecordList list =
-                (ICertRecordList) mCa.getCertificateRepository().findCertRecordsInList(filter, null, 10);
+                mCa.getCertificateRepository().findCertRecordsInList(filter, null, 10);
         int size = list.getSize();
         Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1);
 
@@ -884,10 +884,8 @@ public class EnrollServlet extends CMSServlet {
                             CMS.getUserMessage("CMS_GW_MISSING_SSL_CLIENT_CERT"));
                 }
 
-                certBasedOldSubjectDN = (String)
-                        sslClientCert.getSubjectDN().toString();
-                certBasedOldSerialNum = (BigInteger)
-                        sslClientCert.getSerialNumber();
+                certBasedOldSubjectDN = sslClientCert.getSubjectDN().toString();
+                certBasedOldSerialNum = sslClientCert.getSerialNumber();
 
                 CMS.debug("EnrollServlet: certBasedOldSubjectDN " + certBasedOldSubjectDN);
                 CMS.debug("EnrollServlet: certBasedOldSerialNum " + certBasedOldSerialNum);
@@ -1299,7 +1297,7 @@ public class EnrollServlet extends CMSServlet {
                         (ICertificateAuthority) CMS.getSubsystem("ca");
                 if (certInfoArray != null && caSub != null) {
                     for (int ix = 0; ix < certInfoArray.length; ix++) {
-                        X509CertInfo ci = (X509CertInfo) certInfoArray[ix];
+                        X509CertInfo ci = certInfoArray[ix];
                         String defaultSig = caSub.getDefaultAlgorithm();
                         AlgorithmId algid = AlgorithmId.get(defaultSig);
                         ci.set(X509CertInfo.ALGORITHM_ID,
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
index bf985c93e..6c7aefa4d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
@@ -165,7 +165,7 @@ public class GetBySerial extends CMSServlet {
             return;
         }
 
-        ICertRecord certRecord = (ICertRecord) getCertRecord(serialNo);
+        ICertRecord certRecord = getCertRecord(serialNo);
         if (certRecord == null) {
             log(ILogger.LL_FAILURE,
                     CMS.getLogMessage("CMSGW_CERT_SERIAL_NOT_FOUND_1", serialNo.toString(16)));
@@ -272,7 +272,7 @@ public class GetBySerial extends CMSServlet {
             }
 
             // use import cert template to return cert.
-            X509CertImpl[] certs = new X509CertImpl[] { (X509CertImpl) cert };
+            X509CertImpl[] certs = new X509CertImpl[] { cert };
 
             cmsReq.setResult(certs);
 
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
index da4959268..6fd8be8ea 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import netscape.security.x509.CertificateChain;
-import netscape.security.x509.X509CertImpl;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.authentication.IAuthToken;
@@ -343,8 +342,7 @@ public class GetCAChain extends CMSServlet {
                         throw new IOException("Internal Error");
                     }
 
-                    ICertPrettyPrint certDetails =
-                            CMS.getCertPrettyPrint((X509CertImpl) certs[i]);
+                    ICertPrettyPrint certDetails = CMS.getCertPrettyPrint(certs[i]);
 
                     IArgBlock rarg = CMS.createArgBlock();
 
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
index e9e3c809a..a5a48cc6f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
@@ -168,7 +168,7 @@ public class GetCRL extends CMSServlet {
             crlIP = ca.getCRLIssuingPoint(crlId);
 
         try {
-            crlRecord = (ICRLIssuingPointRecord) ca.getCRLRepository().readCRLIssuingPointRecord(crlId);
+            crlRecord = ca.getCRLRepository().readCRLIssuingPointRecord(crlId);
         } catch (EBaseException e) {
             log(ILogger.LL_FAILURE,
                     CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT_FOUND", crlId));
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
index ce60fabc1..c0c575ad3 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
@@ -316,7 +316,7 @@ class CertFrRequestFiller extends ImportCertsTemplateFiller {
 
                     if (extensions != null) {
                         for (int i = 0; i < extensions.size(); i++) {
-                            Extension ext = (Extension) extensions.elementAt(i);
+                            Extension ext = extensions.elementAt(i);
 
                             if (ext instanceof NSCertTypeExtension) {
                                 NSCertTypeExtension type = (NSCertTypeExtension) ext;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 0d4b52672..58ff2383c 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -361,8 +361,8 @@ public class HashEnrollServlet extends CMSServlet {
                         CMS.getUserMessage("CMS_GW_MISSING_SSL_CLIENT_CERT"));
             }
 
-            certBasedOldSubjectDN = (String) sslClientCert.getSubjectDN().toString();
-            certBasedOldSerialNum = (BigInteger) sslClientCert.getSerialNumber();
+            certBasedOldSubjectDN = sslClientCert.getSubjectDN().toString();
+            certBasedOldSerialNum = sslClientCert.getSerialNumber();
             try {
                 certInfo = (X509CertInfo)
                         ((X509CertImpl) sslClientCert).get(
@@ -442,11 +442,11 @@ public class HashEnrollServlet extends CMSServlet {
 
                 // first, make sure the client cert is indeed a
                 //				signing only cert
-                if ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+                if ((CMS.isSigningCert(sslClientCert) ==
                         false) ||
-                        ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+                        ((CMS.isSigningCert(sslClientCert) ==
                             true) &&
-                        (CMS.isEncryptionCert((X509CertImpl) sslClientCert) ==
+                        (CMS.isEncryptionCert(sslClientCert) ==
                             true))) {
                     // either it's not a signing cert, or it's a dual cert
                     log(ILogger.LL_FAILURE,
@@ -477,8 +477,8 @@ public class HashEnrollServlet extends CMSServlet {
                                 + certBasedOldSubjectDN + ")(!(x509cert.serialNumber=" + certBasedOldSerialNum
                                 + "))(certStatus=VALID))";
                 ICertRecordList list =
-                        (ICertRecordList) mCa.getCertificateRepository().findCertRecordsInList(filter,
-                                null, 10);
+                        mCa.getCertificateRepository().findCertRecordsInList(filter,
+                        null, 10);
                 int size = list.getSize();
                 Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1);
                 boolean gotEncCert = false;
@@ -547,11 +547,11 @@ public class HashEnrollServlet extends CMSServlet {
             } else if (certauthEnrollType.equals(CERT_AUTH_ENCRYPTION)) {
                 // first, make sure the client cert is indeed a
                 //				signing only cert
-                if ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+                if ((CMS.isSigningCert(sslClientCert) ==
                         false) ||
-                        ((CMS.isSigningCert((X509CertImpl) sslClientCert) ==
+                        ((CMS.isSigningCert(sslClientCert) ==
                             true) &&
-                        (CMS.isEncryptionCert((X509CertImpl) sslClientCert) ==
+                        (CMS.isEncryptionCert(sslClientCert) ==
                             true))) {
                     // either it's not a signing cert, or it's a dual cert
                     log(ILogger.LL_FAILURE,
@@ -810,8 +810,7 @@ public class HashEnrollServlet extends CMSServlet {
                     authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT);
 
             if (subjectname != null) {
-                CertificateSubjectName certSubject = (CertificateSubjectName)
-                        new CertificateSubjectName(new X500Name(subjectname));
+                CertificateSubjectName certSubject = new CertificateSubjectName(new X500Name(subjectname));
 
                 certInfo.set(X509CertInfo.SUBJECT, certSubject);
                 log(ILogger.LL_INFO,
@@ -1223,7 +1222,7 @@ public class HashEnrollServlet extends CMSServlet {
                     newvalue[4] = 0;
                     KeyUsageExtension newext =
                             new KeyUsageExtension(Boolean.valueOf(true),
-                                    (Object) newvalue);
+                                    newvalue);
 
                     exts.delete(KeyUsageExtension.NAME);
                     exts.set(KeyUsageExtension.NAME, newext);
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
index 016d5a124..a56ac1d88 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
@@ -156,8 +156,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller {
             fixed.set(CERT_TYPE, certType);
 
         // this authority
-        fixed.set(ICMSTemplateFiller.AUTHORITY,
-                (String) authority.getOfficialName());
+        fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName());
 
         // CA chain.
         CertificateChain cachain =
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
index 4185113f4..96b2a9026 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
@@ -150,7 +150,7 @@ public class ListCerts extends CMSServlet {
             Enumeration<String> filters = mAllowedClientFilters.elements();
             // check to see if the filter is allowed
             while (filters.hasMoreElements()) {
-                String filter = (String) filters.nextElement();
+                String filter = filters.nextElement();
                 com.netscape.certsrv.apps.CMS.debug("Comparing filter="
                         + filter + " queryCertFilter=" + queryCertFilter);
                 if (filter.equals(queryCertFilter)) {
@@ -389,7 +389,7 @@ public class ListCerts extends CMSServlet {
         } else
             pSize = maxCount;
 
-        ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList(
+        ICertRecordList list = mCertDB.findCertRecordsInList(
                 filter, (String[]) null, jumpTo, mHardJumpTo, "serialno",
                 pSize);
         // retrive maxCount + 1 entries
@@ -402,7 +402,7 @@ public class ListCerts extends CMSServlet {
         if (!serialToVal.equals(MINUS_ONE)) {
             // if user specify a range, we need to
             // calculate the totalRecordCount
-            tolist = (ICertRecordList) mCertDB.findCertRecordsInList(
+            tolist = mCertDB.findCertRecordsInList(
                         filter,
                         (String[]) null, serialTo,
                         "serialno", maxCount);
@@ -438,7 +438,7 @@ public class ListCerts extends CMSServlet {
              * last item to be displayed, we need to skip it
              */
             while ((count < ((mReverse && !mHardJumpTo) ? (maxCount + 1) : maxCount)) && e.hasMoreElements()) {
-                ICertRecord rec = (ICertRecord) e.nextElement();
+                ICertRecord rec = e.nextElement();
 
                 if (rec == null) {
                     com.netscape.certsrv.apps.CMS.debug("record " + count + " is null");
@@ -505,7 +505,7 @@ public class ListCerts extends CMSServlet {
         ICertRecord nextRec = null;
 
         if (e.hasMoreElements()) {
-            nextRec = (ICertRecord) e.nextElement();
+            nextRec = e.nextElement();
         }
 
         header.addStringValue("op", req.getParameter("op"));
@@ -657,7 +657,7 @@ public class ListCerts extends CMSServlet {
                     int reason = 0;
 
                     while (enum1.hasMoreElements()) {
-                        Extension ext = (Extension) enum1.nextElement();
+                        Extension ext = enum1.nextElement();
 
                         if (ext instanceof CRLReasonExtension) {
                             reason = ((CRLReasonExtension) ext).getReason().toInt();
diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
index 7f626a83f..884616fe9 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
@@ -270,9 +270,7 @@ public class Monitor extends CMSServlet {
     }
 
     Date nextDate(Date d, int seconds) {
-        Date date = new Date((d.getTime()) + ((long) (seconds * 1000)));
-
-        return date;
+        return new Date(d.getTime() + seconds * 1000);
     }
 
     String getIntervalInfo(IArgBlock arg, Date startDate, Date endDate) {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index 3b2a8c3e9..f0840c408 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
@@ -217,8 +217,7 @@ public class RenewalServlet extends CMSServlet {
                         );
                 // create new certinfo from old_cert contents.
                 X509CertInfo old_certInfo = (X509CertInfo)
-                        ((X509CertImpl) old_cert).get(
-                                X509CertImpl.NAME + "." + X509CertImpl.INFO);
+                        old_cert.get(X509CertImpl.NAME + "." + X509CertImpl.INFO);
 
                 new_certInfo = new X509CertInfo(old_certInfo.getEncodedInfo());
             } else {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index 2c1709145..4c4f7e9e0 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
@@ -209,7 +209,7 @@ public class RevocationServlet extends CMSServlet {
 
         if (mNonces != null) {
             long n = mRandom.nextLong();
-            long m = mNonces.addNonce(n, (X509Certificate) old_cert);
+            long m = mNonces.addNonce(n, old_cert);
             if ((n + m) != 0) {
                 header.addStringValue("nonce", Long.toString(m));
             }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
index 00941776c..2fce3e6e1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
@@ -76,8 +76,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller {
         fixed.set(ICMSTemplateFiller.SCHEME, scheme);
 
         // this authority
-        fixed.set(ICMSTemplateFiller.AUTHORITY,
-                (String) authority.getOfficialName());
+        fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName());
 
         // XXX CA chain.
 
diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
index 375265331..45b02969d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
@@ -105,7 +105,7 @@ public class SrchCerts extends CMSServlet {
         mTemplates.remove(CMSRequest.SUCCESS);
 
         if (mAuthority instanceof ISubsystem) {
-            ISubsystem sub = (ISubsystem) mAuthority;
+            ISubsystem sub = mAuthority;
             IConfigStore authConfig = sub.getConfigStore();
 
             if (authConfig != null) {
@@ -686,7 +686,7 @@ public class SrchCerts extends CMSServlet {
         rarg.addStringValue("serialNumber", cert.getSerialNumber().toString(16));
         rarg.addStringValue("serialNumberDecimal", cert.getSerialNumber().toString());
 
-        String subject = (String) cert.getSubjectDN().toString();
+        String subject = cert.getSubjectDN().toString();
 
         if (subject.equals("")) {
             rarg.addStringValue("subject", " ");
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index df0277b54..3dae379a1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -235,7 +235,7 @@ public class UpdateDir extends CMSServlet {
 
         try {
             if (mCRLRepository != null) {
-                crlRecord = (ICRLIssuingPointRecord) mCRLRepository.readCRLIssuingPointRecord(crlIssuingPointId);
+                crlRecord = mCRLRepository.readCRLIssuingPointRecord(crlIssuingPointId);
             }
         } catch (EBaseException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_CRL_RECORD", e.toString()));
@@ -383,7 +383,7 @@ public class UpdateDir extends CMSServlet {
             }
         }
 
-        ICertificateRepository certificateRepository = (ICertificateRepository) mCA.getCertificateRepository();
+        ICertificateRepository certificateRepository = mCA.getCertificateRepository();
 
         // all or ca
         if ((updateValue[UPDATE_ALL] != null &&
@@ -473,9 +473,9 @@ public class UpdateDir extends CMSServlet {
 
                             if (r == null) {
                                 if (CMS.isEncryptionCert(cert))
-                                    sc.put((Object) "isEncryptionCert", (Object) "true");
+                                    sc.put("isEncryptionCert", "true");
                                 else
-                                    sc.put((Object) "isEncryptionCert", (Object) "false");
+                                    sc.put("isEncryptionCert", "false");
                                 mPublisherProcessor.publishCert(cert, null);
                             } else {
                                 if (CMS.isEncryptionCert(cert))
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 421381441..e56651ed8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -211,7 +211,7 @@ public class CRSEnrollment extends HttpServlet {
         @SuppressWarnings("unchecked")
         Enumeration<String> names = req.getParameterNames();
         while (names.hasMoreElements()) {
-            String name = (String) names.nextElement();
+            String name = names.nextElement();
             httpReqHash.put(name, req.getParameter(name));
         }
         return httpReqHash;
@@ -421,7 +421,7 @@ public class CRSEnrollment extends HttpServlet {
 
         if (authNames != null) {
             while (authNames.hasMoreElements()) {
-                String authName = (String) authNames.nextElement();
+                String authName = authNames.nextElement();
 
                 credentials.set(authName, request.getParameter(authName));
             }
@@ -468,7 +468,7 @@ public class CRSEnrollment extends HttpServlet {
             byte[] bytes = null;
 
             int i = 0;
-            String message = (String) httpReq.getParameter(URL_MESSAGE);
+            String message = httpReq.getParameter(URL_MESSAGE);
             CMS.debug("handleGetCACert message=" + message);
             if (message != null) {
                 try {
@@ -541,7 +541,7 @@ public class CRSEnrollment extends HttpServlet {
 
         try {
             while (e.hasMoreElements()) {
-                PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement();
+                PKCS10Attribute p10a = e.nextElement();
                 CertAttrSet attr = p10a.getAttributeValue();
 
                 if (attr.getName().equals(ChallengePassword.NAME)) {
@@ -679,7 +679,7 @@ public class CRSEnrollment extends HttpServlet {
             responseData = responseData +
                     "<MessageType>" + mt + "</MessageType>";
 
-            PKCS10 p10 = (PKCS10) req.getP10();
+            PKCS10 p10 = req.getP10();
             X500Name p10subject = p10.getSubjectName();
             responseData = responseData +
                     "<SubjectName>" + p10subject.toString() + "</SubjectName>";
@@ -689,7 +689,7 @@ public class CRSEnrollment extends HttpServlet {
             Enumeration<PKCS10Attribute> e = p10atts.getElements();
 
             while (e.hasMoreElements()) {
-                PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement();
+                PKCS10Attribute p10a = e.nextElement();
                 CertAttrSet attr = p10a.getAttributeValue();
 
                 if (attr.getName().equals(ChallengePassword.NAME)) {
@@ -1066,7 +1066,7 @@ public class CRSEnrollment extends HttpServlet {
             return result;
         }
 
-        ILdapConnFactory connFactory = ((IPublisherProcessor) ldapPub).getLdapConnModule().getLdapConnFactory();
+        ILdapConnFactory connFactory = ldapPub.getLdapConnModule().getLdapConnFactory();
         if (connFactory == null) {
             return result;
         }
@@ -1190,7 +1190,7 @@ public class CRSEnrollment extends HttpServlet {
 
             X500NameAttrMap xnap = X500NameAttrMap.getDefault();
             while (rdne.hasMoreElements()) {
-                RDN rdn = (RDN) rdne.nextElement();
+                RDN rdn = rdne.nextElement();
                 int i = 0;
                 AVA[] oldavas = rdn.getAssertion();
                 for (i = 0; i < rdn.getAssertionLength(); i++) {
@@ -1229,13 +1229,12 @@ public class CRSEnrollment extends HttpServlet {
             Enumeration<PKCS10Attribute> e = p10atts.getElements();
 
             while (e.hasMoreElements()) {
-                PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement();
+                PKCS10Attribute p10a = e.nextElement();
                 CertAttrSet attr = p10a.getAttributeValue();
 
                 if (attr.getName().equals(ChallengePassword.NAME)) {
                     if (attr.get(ChallengePassword.PASSWORD) != null) {
-                        req.put(AUTH_PASSWORD,
-                                    (String) attr.get(ChallengePassword.PASSWORD));
+                        req.put(AUTH_PASSWORD, attr.get(ChallengePassword.PASSWORD));
                         req.put(ChallengePassword.NAME,
                                 hashPassword(
                                     (String) attr.get(ChallengePassword.PASSWORD)));
@@ -1270,7 +1269,7 @@ public class CRSEnrollment extends HttpServlet {
                             Enumeration<GeneralNameInterface> gne = v.elements();
 
                             while (gne.hasMoreElements()) {
-                                GeneralNameInterface gni = (GeneralNameInterface) gne.nextElement();
+                                GeneralNameInterface gni = gne.nextElement();
                                 if (gni instanceof GeneralName) {
                                     GeneralName genName = (GeneralName) gni;
 
@@ -1361,12 +1360,12 @@ public class CRSEnrollment extends HttpServlet {
         itemCount = 0;
         Enumeration<String> en = ht.keys();
         while (en.hasMoreElements()) {
-            String key = (String) en.nextElement();
+            String key = en.nextElement();
             if (key.equals(SANE_DNSNAME)) {
-                gn[itemCount++] = new DNSName((String) ht.get(key));
+                gn[itemCount++] = new DNSName(ht.get(key));
             }
             if (key.equals(SANE_IPADDRESS)) {
-                gn[itemCount++] = new IPAddressName((String) ht.get(key));
+                gn[itemCount++] = new IPAddressName(ht.get(key));
             }
         }
 
@@ -1711,7 +1710,7 @@ public class CRSEnrollment extends HttpServlet {
 
         MessageDigest md;
         String[] hashes = new String[] { "MD2", "MD5", "SHA1", "SHA256", "SHA512" };
-        PKCS10 p10 = (PKCS10) req.getP10();
+        PKCS10 p10 = req.getP10();
 
         for (int i = 0; i < hashes.length; i++) {
             try {
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
index a8d753e7c..e0716cb70 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
@@ -94,7 +94,7 @@ public class CMSFileLoader {
         // Change end
         String absPath = file.getAbsolutePath();
         long modified = file.lastModified();
-        CMSFile cmsFile = (CMSFile) mLoadedFiles.get(absPath);
+        CMSFile cmsFile = mLoadedFiles.get(absPath);
         long lastModified = (cmsFile == null ? 0 : cmsFile.getLastModified());
 
         // new file.
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
index 055a025b2..6d51c8d4c 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
@@ -155,7 +155,7 @@ public class CMSTemplate extends CMSFile {
         Enumeration<String> e = null;
         Enumeration<IArgBlock> q = null;
         IArgBlock r = null;
-        CMSTemplateParams data = (CMSTemplateParams) input;
+        CMSTemplateParams data = input;
         HTTPOutputStreamWriter http_out = null;
 
         if (mCharset == null)
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
index 60b79a81e..83a2d8cf0 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
@@ -19,7 +19,6 @@ package com.netscape.cms.servlet.common;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
@@ -226,7 +225,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller {
 
                         ByteArrayOutputStream ostream = new ByteArrayOutputStream();
 
-                        rb.encode((OutputStream) ostream);
+                        rb.encode(ostream);
                         digest = SHADigest.digest(ostream.toByteArray());
                     } catch (NoSuchAlgorithmException ex) {
                         //log("digest fail");
@@ -259,7 +258,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller {
                     ByteArrayOutputStream ostream = new
                             ByteArrayOutputStream();
 
-                    fullResponse.encode((OutputStream) ostream);
+                    fullResponse.encode(ostream);
                     byte[] fr = ostream.toByteArray();
 
                     fixed.set(FULL_RESPONSE, CMS.BtoA(fr));
diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
index 1d19a0b17..856679e3a 100644
--- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
@@ -98,7 +98,7 @@ public class ServletUtils {
         StringTokenizer tokenizer = new StringTokenizer(aclInfo, "#");
 
         while (tokenizer.hasMoreTokens()) {
-            String acl = (String) tokenizer.nextToken();
+            String acl = tokenizer.nextToken();
 
             authz.authzMgrAccessInit(aclMethod, acl);
         }
diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
index 467cc1cf4..7a2c64d33 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
@@ -185,7 +185,7 @@ public class CloneServlet extends CMSServlet {
             // cfu maybe don't need CCA_Id, because the above check
             //			was good enough
             CCAUserId = token.getInString("userid");
-            CCA_Id = (String) peerCert.getSubjectDN().toString();
+            CCA_Id = peerCert.getSubjectDN().toString();
         } catch (EInvalidCredentials e) {
             // already logged.
             resp.sendError(HttpServletResponse.SC_UNAUTHORIZED);
diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index c566753b6..e8b8f12f8 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -131,8 +131,8 @@ public class ConnectorServlet extends CMSServlet {
             throw new IOException(
                     "CMS server is not ready to serve.");
 
-        HttpServletRequest req = (HttpServletRequest) request;
-        HttpServletResponse resp = (HttpServletResponse) response;
+        HttpServletRequest req = request;
+        HttpServletResponse resp = response;
 
         CMSRequest cmsRequest = newCMSRequest();
 
@@ -215,7 +215,7 @@ public class ConnectorServlet extends CMSServlet {
         try {
             token = authenticate(request);
             raUserId = token.getInString("userid");
-            RA_Id = (String) peerCert.getSubjectDN().toString();
+            RA_Id = peerCert.getSubjectDN().toString();
         } catch (EInvalidCredentials e) {
             // already logged.
             resp.sendError(HttpServletResponse.SC_UNAUTHORIZED);
diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
index 0f79d6394..860cc68f8 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
@@ -101,7 +101,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet {
         ByteArrayOutputStream out = new ByteArrayOutputStream(s.length());
 
         for (int i = 0; i < s.length(); i++) {
-            int c = (int) s.charAt(i);
+            int c = s.charAt(i);
 
             if (c == '+') {
                 out.write(' ');
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
index a3d933993..cc9d5f35a 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
@@ -175,7 +175,7 @@ public class AdminPanel extends WizardPanelBase {
             context.put("admin_pwd_again", "");
             context.put("admin_uid", ADMIN_UID);
         }
-        ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+        ISubsystem ca = CMS.getSubsystem("ca");
 
         if (ca == null) {
             context.put("ca", "false");
@@ -260,7 +260,7 @@ public class AdminPanel extends WizardPanelBase {
         } catch (Exception e) {
         }
 
-        ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+        ISubsystem ca = CMS.getSubsystem("ca");
 
         if (ca == null) {
             context.put("ca", "false");
@@ -606,7 +606,7 @@ public class AdminPanel extends WizardPanelBase {
             // update the locally created request for renewal
             CertUtil.updateLocalRequest(cs, CERT_TAG, cert_request, cert_request_type, subject);
 
-            ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+            ISubsystem ca = CMS.getSubsystem("ca");
             if (ca != null) {
                 createPKCS7(impl);
             }
@@ -627,7 +627,7 @@ public class AdminPanel extends WizardPanelBase {
 
         context.put("title", "Administrator");
         context.put("panel", "admin/console/config/adminpanel.vm");
-        ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+        ISubsystem ca = CMS.getSubsystem("ca");
         IConfigStore cs = CMS.getConfigStore();
         String type = "";
         String info = "";
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 20ddf9f2d..634be8748 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
@@ -502,7 +502,7 @@ public class CertRequestPanel extends WizardPanelBase {
             }
 
             while (c.hasMoreElements()) {
-                Cert cert = (Cert) c.nextElement();
+                Cert cert = c.nextElement();
                 String certTag = cert.getCertTag();
                 String subsystem = cert.getSubsystem();
                 boolean enable = config.getBoolean(PCERT_PREFIX + certTag + ".enable", true);
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index 71703c888..e3068d7b3 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -350,7 +350,7 @@ public class CertUtil {
             }
             ca = (ICertificateAuthority) CMS.getSubsystem(
                     ICertificateAuthority.ID);
-            cr = (ICertificateRepository) ca.getCertificateRepository();
+            cr = ca.getCertificateRepository();
             BigInteger serialNo = cr.getNextSerialNumber();
             if (type.equals("selfsign")) {
                 CMS.debug("Creating local certificate... issuerdn=" + dn);
@@ -466,7 +466,7 @@ public class CertUtil {
             }
 
             meta.set(ICertRecord.META_PROFILE_ID, profileId);
-            record = (ICertRecord) cr.createCertRecord(
+            record = cr.createCertRecord(
                     cert.getSerialNumber(), cert, meta);
         } catch (Exception e) {
             CMS.debug(
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
index a12bb164f..7019d1492 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
@@ -113,7 +113,7 @@ public class ImportAdminCertPanel extends WizardPanelBase {
 
         context.put("caType", type);
 
-        ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+        ISubsystem ca = CMS.getSubsystem("ca");
 
         if (ca == null) {
             context.put("ca", "false");
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
index d0ccb58e9..bc4af9828 100755
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
@@ -93,7 +93,7 @@ public class ImportCAChainPanel extends WizardPanelBase {
             context.put("errorString", "Error loading values for Import CA Certificate Panel");
         }
 
-        ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
+        ISubsystem ca = CMS.getSubsystem("ca");
 
         if (ca == null) {
             context.put("ca", "false");
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 2f6238304..4ea150ea2 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
@@ -164,13 +164,13 @@ public class RegisterUser extends CMSServlet {
             X509CertImpl cert = null;
             bCert = Utils.base64decode(certsString);
             cert = new X509CertImpl(bCert);
-            certs[0] = (X509Certificate) cert;
+            certs[0] = cert;
 
             // test to see if the cert already belongs to a user
             ICertUserLocator cul = ugsys.getCertUserLocator();
             com.netscape.certsrv.usrgrp.Certificates c =
                     new com.netscape.certsrv.usrgrp.Certificates(certs);
-            user = (IUser) cul.locateUser(c);
+            user = cul.locateUser(c);
         } catch (Exception ec) {
             CMS.debug("RegisterUser: exception thrown: " + ec.toString());
         }
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index 5dd05b2cd..fe6507f37 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
@@ -429,7 +429,7 @@ public class UpdateDomainXML extends CMSServlet {
                     int len = nodeList.getLength();
 
                     for (int i = 0; i < len; i++) {
-                        Node nn = (Node) nodeList.item(i);
+                        Node nn = nodeList.item(i);
                         Vector<String> v_name = parser.getValuesFromContainer(nn, "SubsystemName");
                         Vector<String> v_host = parser.getValuesFromContainer(nn, "Host");
                         Vector<String> v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort");
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index 55f7171ef..276b76d4e 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
@@ -1052,7 +1052,7 @@ public class WizardPanelBase implements IWizardPanel {
             for (int i = 0; i < len; i++) {
                 Vector<String> v_clone = parser.getValuesFromContainer(nodeList.item(i),
                         "Clone");
-                String clone = (String) v_clone.elementAt(0);
+                String clone = v_clone.elementAt(0);
                 if (clone.equalsIgnoreCase("true"))
                     continue;
                 Vector<String> v_name = parser.getValuesFromContainer(nodeList.item(i),
diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
index aa51ec35f..3b5567bdb 100644
--- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
@@ -177,7 +177,7 @@ public class ConfirmRecoverBySerial extends CMSServlet {
             header.addStringValue(OUT_SERVICE_URL,
                     req.getRequestURI());
 
-            IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq);
+            IKeyRecord rec = mKeyDB.readKeyRecord(seq);
 
             KeyRecordParser.fillRecordIntoArg(rec, header);
         } catch (EBaseException e) {
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
index e414dde9a..9c7454ec9 100644
--- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
@@ -184,7 +184,7 @@ public class DisplayBySerial extends CMSServlet {
                     req.getParameter(OUT_OP));
             header.addStringValue(OUT_SERVICE_URL,
                     req.getRequestURI());
-            IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq);
+            IKeyRecord rec = mKeyDB.readKeyRecord(seq);
 
             KeyRecordParser.fillRecordIntoArg(rec, header);
         } catch (EBaseException e) {
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
index 9bc1c1b4f..bfe47a957 100644
--- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
@@ -200,7 +200,7 @@ public class DisplayBySerialForRecovery extends CMSServlet {
                 header.addStringValue("publicKeyData",
                         publicKeyData);
             }
-            IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq);
+            IKeyRecord rec = mKeyDB.readKeyRecord(seq);
 
             KeyRecordParser.fillRecordIntoArg(rec, header);
 
diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
index 630ef1b14..4ee751f1a 100644
--- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
@@ -231,7 +231,7 @@ public class ExamineRecovery extends CMSServlet {
 
             IKeyRepository mKeyDB =
                     ((IKeyRecoveryAuthority) mAuthority).getKeyRepository();
-            IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(new
+            IKeyRecord rec = mKeyDB.readKeyRecord(new
                     BigInteger(keyID));
             KeyRecordParser.fillRecordIntoArg(rec, header);
 
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
index 9ce331412..554e0e9ef 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
@@ -174,13 +174,11 @@ public class PKCS10Processor extends PKIProcessor {
             PKCS10Attributes p10Attrs = p10.getAttributes();
 
             if (p10Attrs != null) {
-                PKCS10Attribute p10Attr = (PKCS10Attribute)
-                        (p10Attrs.getAttribute(CertificateExtensions.NAME));
+                PKCS10Attribute p10Attr = p10Attrs.getAttribute(CertificateExtensions.NAME);
 
                 if (p10Attr != null && p10Attr.getAttributeId().equals(
                         PKCS9Attribute.EXTENSION_REQUEST_OID)) {
-                    Extensions exts0 = (Extensions)
-                            (p10Attr.getAttributeValue());
+                    Extensions exts0 = (Extensions) p10Attr.getAttributeValue();
                     DerOutputStream extOut = new DerOutputStream();
 
                     exts0.encode(extOut);
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
index b3859ad2f..d51494928 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
@@ -115,8 +115,7 @@ public class PKIProcessor implements IPKIProcessor {
                     authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT);
 
             if (subjectname != null) {
-                CertificateSubjectName certSubject = (CertificateSubjectName)
-                        new CertificateSubjectName(new X500Name(subjectname));
+                CertificateSubjectName certSubject = new CertificateSubjectName(new X500Name(subjectname));
 
                 certInfo.set(X509CertInfo.SUBJECT, certSubject);
                 log(ILogger.LL_INFO,
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
index 9556da8e3..fed0b1ee2 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
@@ -130,7 +130,7 @@ public class ProfileListServlet extends ProfileServlet {
 
         if (e != null) {
             while (e.hasMoreElements()) {
-                String id = (String) e.nextElement();
+                String id = e.nextElement();
                 IProfile profile = null;
 
                 try {
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
index a4213e3a1..10013c88c 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
@@ -201,8 +201,7 @@ public class ProfileSelectServlet extends ProfileServlet {
                 if (policyIds != null) {
                     while (policyIds.hasMoreElements()) {
                         String id = policyIds.nextElement();
-                        IProfilePolicy policy = (IProfilePolicy)
-                                profile.getProfilePolicy(setId, id);
+                        IProfilePolicy policy = profile.getProfilePolicy(setId, id);
 
                         // (3) query all the profile policies
                         // (4) default plugins convert request parameters into string
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index 64ab5f82d..7292be519 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
@@ -134,12 +134,12 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (inputIds != null) {
             while (inputIds.hasMoreElements()) {
-                String inputId = (String) inputIds.nextElement();
+                String inputId = inputIds.nextElement();
                 IProfileInput profileInput = profile.getProfileInput(inputId);
                 Enumeration<String> inputNames = profileInput.getValueNames();
 
                 while (inputNames.hasMoreElements()) {
-                    String inputName = (String) inputNames.nextElement();
+                    String inputName = inputNames.nextElement();
                     if (request.getParameter(inputName) != null) {
                         // all subject name parameters start with sn_, no other input parameters do
                         if (inputName.matches("^sn_.*")) {
@@ -165,12 +165,12 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (inputIds != null) {
             while (inputIds.hasMoreElements()) {
-                String inputId = (String) inputIds.nextElement();
+                String inputId = inputIds.nextElement();
                 IProfileInput profileInput = profile.getProfileInput(inputId);
                 Enumeration<String> inputNames = profileInput.getValueNames();
 
                 while (inputNames.hasMoreElements()) {
-                    String inputName = (String) inputNames.nextElement();
+                    String inputName = inputNames.nextElement();
                     String inputValue = "";
                     CMS.debug("ProfileSubmitServlet: setInputsIntoContext() getting input name= " + inputName);
                     try {
@@ -198,7 +198,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
         if (authIds != null) {
             CMS.debug("ProfileSubmitServlet:setCredentialsIntoContext() authNames not null");
             while (authIds.hasMoreElements()) {
-                String authName = (String) authIds.nextElement();
+                String authName = authIds.nextElement();
 
                 CMS.debug("ProfileSubmitServlet:setCredentialsIntoContext() authName:" +
                         authName);
@@ -307,7 +307,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (authNames != null) {
             while (authNames.hasMoreElements()) {
-                String authName = (String) authNames.nextElement();
+                String authName = authNames.nextElement();
 
                 credentials.set(authName, request.getParameter(authName));
             }
@@ -333,13 +333,13 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (inputIds != null) {
             while (inputIds.hasMoreElements()) {
-                String inputId = (String) inputIds.nextElement();
+                String inputId = inputIds.nextElement();
                 IProfileInput profileInput = profile.getProfileInput(inputId);
                 Enumeration<String> inputNames = profileInput.getValueNames();
 
                 if (inputNames != null) {
                     while (inputNames.hasMoreElements()) {
-                        String inputName = (String) inputNames.nextElement();
+                        String inputName = inputNames.nextElement();
 
                         if (request.getParameter(inputName) != null) {
                             // special characters in subject names parameters must be escaped
@@ -367,12 +367,12 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (inputIds != null) {
             while (inputIds.hasMoreElements()) {
-                String inputId = (String) inputIds.nextElement();
+                String inputId = inputIds.nextElement();
                 IProfileInput profileInput = profile.getProfileInput(inputId);
                 Enumeration<String> inputNames = profileInput.getValueNames();
 
                 while (inputNames.hasMoreElements()) {
-                    String inputName = (String) inputNames.nextElement();
+                    String inputName = inputNames.nextElement();
                     String inputValue = "";
                     CMS.debug("ProfileSubmitServlet: setInputsIntoRequest() getting input name= " + inputName);
                     try {
@@ -398,7 +398,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
 
         if (outputIds != null) {
             while (outputIds.hasMoreElements()) {
-                String outputId = (String) outputIds.nextElement();
+                String outputId = outputIds.nextElement();
                 IProfileOutput profileOutput = profile.getProfileOutput(outputId);
 
                 Enumeration<String> outputNames = profileOutput.getValueNames();
@@ -406,7 +406,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
                 if (outputNames != null) {
                     while (outputNames.hasMoreElements()) {
                         ArgSet outputset = new ArgSet();
-                        String outputName = (String) outputNames.nextElement();
+                        String outputName = outputNames.nextElement();
                         IDescriptor outputDesc =
                                 profileOutput.getValueDescriptor(locale, outputName);
 
@@ -560,7 +560,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
         if ((renewal != null) && (renewal.equalsIgnoreCase("true"))) {
             CMS.debug("ProfileSubmitServlet: isRenewal true");
             isRenewal = true;
-            request.setAttribute("reqType", (Object) "renewal");
+            request.setAttribute("reqType", "renewal");
         } else {
             CMS.debug("ProfileSubmitServlet: isRenewal false");
         }
@@ -715,7 +715,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
                     outputTemplate(request, response, args);
                     return;
                 }
-                ICertRecord rec = (ICertRecord) certDB.readCertificateRecord(certSerial);
+                ICertRecord rec = certDB.readCertificateRecord(certSerial);
                 if (rec == null) {
                     CMS.debug("ProfileSubmitServlet: renewal cert record not found for serial number "
                             + certSerial.toString());
@@ -1486,7 +1486,7 @@ public class ProfileSubmitServlet extends ProfileServlet {
                         reqs[i].getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO);
                 if (certInfo != null) {
                     String subject = "";
-                    subject = (String) certInfo.get(X509CertInfo.SUBJECT).toString();
+                    subject = certInfo.get(X509CertInfo.SUBJECT).toString();
                     xmlObj.addItemToContainer(subnode, "SubjectDN", subject);
                 } else {
                     CMS.debug("ProfileSubmitServlet xmlOutput: no certInfo found in request");
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
index b2043238b..1733998aa 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
@@ -148,7 +148,7 @@ public class CertReqParser extends ReqParser {
                     if (certType != null) {
                         arg.addStringValue(IRequest.CERT_TYPE, certType);
                     }
-                    String presenceServerExt = (String) http_params.get("PresenceServerExtension");
+                    String presenceServerExt = http_params.get("PresenceServerExtension");
 
                     if (presenceServerExt != null) {
                         arg.addStringValue("PresenceServerExtension", presenceServerExt);
@@ -616,8 +616,7 @@ public class CertReqParser extends ReqParser {
 
     public String getRequestorDN(IRequest request) {
         try {
-            X509CertInfo info = (X509CertInfo)
-                    request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO);
+            X509CertInfo info = request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO);
             // retrieve the subject name
             CertificateSubjectName sn = (CertificateSubjectName)
                     info.get(X509CertInfo.SUBJECT);
@@ -688,7 +687,7 @@ public class CertReqParser extends ReqParser {
             prefix = "header.";
 
         while (enum1.hasMoreElements()) {
-            String name = (String) enum1.nextElement();
+            String name = enum1.nextElement();
 
             if (mDetails) {
                 // show all http parameters stored in request.
@@ -708,7 +707,7 @@ public class CertReqParser extends ReqParser {
                         String parami =
                                 IRequest.HTTP_PARAMS + LB + String.valueOf(counter++) + RB;
                         // hack
-                        String n = (String) elms.nextElement();
+                        String n = elms.nextElement();
                         String rawJS = "new Object;\n\r" +
                                 prefix + parami + ".name=\"" +
                                 CMSTemplate.escapeJavaScriptString(n) + "\";\n\r" +
@@ -748,7 +747,7 @@ public class CertReqParser extends ReqParser {
                         String parami =
                                 IRequest.AUTH_TOKEN + LB + String.valueOf(counter++) + RB;
                         // hack
-                        String n = (String) elms.nextElement();
+                        String n = elms.nextElement();
                         String v =
                                 expandValue(prefix + parami + ".value",
                                         auth_token.getInString(n));
@@ -833,7 +832,7 @@ public class CertReqParser extends ReqParser {
 
                             if (crlExtensions != null) {
                                 for (int k = 0; k < crlExtensions.size(); k++) {
-                                    Extension ext = (Extension) crlExtensions.elementAt(k);
+                                    Extension ext = crlExtensions.elementAt(k);
 
                                     if (ext instanceof CRLReasonExtension) {
                                         rarg.addStringValue("reason",
@@ -874,7 +873,7 @@ public class CertReqParser extends ReqParser {
                 //X509CertImpl oldCert[] =
                 //	(X509CertImpl[])req.get(IRequest.OLD_CERTS);
                 Certificate oldCert[] =
-                        (Certificate[]) req.getExtDataInCertArray(IRequest.OLD_CERTS);
+                        req.getExtDataInCertArray(IRequest.OLD_CERTS);
 
                 if (oldCert != null && oldCert.length > 0) {
                     if (oldCert[0] instanceof X509CertImpl) {
@@ -906,7 +905,7 @@ public class CertReqParser extends ReqParser {
                     CRLExtensions crlExtensions = revokedCert[0].getExtensions();
 
                     for (int k = 0; k < crlExtensions.size(); k++) {
-                        Extension ext = (Extension) crlExtensions.elementAt(k);
+                        Extension ext = crlExtensions.elementAt(k);
 
                         if (ext instanceof CRLReasonExtension) {
                             arg.addStringValue("reason",
diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
index 43b6d8901..41e6523a5 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
@@ -419,7 +418,7 @@ public class CheckRequest extends CMSServlet {
                                     StringBuffer res = new StringBuffer();
 
                                     while (tokenizer.hasMoreTokens()) {
-                                        String elem = (String) tokenizer.nextToken();
+                                        String elem = tokenizer.nextToken();
 
                                         res.append(elem);
                                     }
@@ -528,7 +527,7 @@ public class CheckRequest extends CMSServlet {
                                             digestAlg = DigestAlgorithm.SHA1;
                                             ByteArrayOutputStream ostream = new ByteArrayOutputStream();
 
-                                            rb.encode((OutputStream) ostream);
+                                            rb.encode(ostream);
                                             digest = SHADigest.digest(ostream.toByteArray());
                                         } catch (NoSuchAlgorithmException ex) {
                                             //log("digest fail");
@@ -575,7 +574,7 @@ public class CheckRequest extends CMSServlet {
                                         ByteArrayOutputStream ostream = new
                                                 ByteArrayOutputStream();
 
-                                        fullResponse.encode((OutputStream) ostream);
+                                        fullResponse.encode(ostream);
                                         byte[] fr = ostream.toByteArray();
 
                                         header.addStringValue(FULL_RESPONSE, CMS.BtoA(fr));
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
index 6c863733f..9e1247520 100644
--- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
@@ -71,7 +71,7 @@ public class KeyReqParser extends ReqParser {
             arg.addStringValue(OUTPUT_SERIALNO, kid.toString());
 
             // for async recovery
-            String agents = (String) req.getExtDataInString("approvingAgents");
+            String agents = req.getExtDataInString("approvingAgents");
             arg.addStringValue("approvingAgents", agents);
         } else {
             System.out.println("Bad Request " + type);
diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
index b9fa461fd..02dac53f9 100644
--- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
@@ -99,7 +99,7 @@ public class SearchReqs extends CMSServlet {
         mTemplates.remove(CMSRequest.SUCCESS);
 
         if (mAuthority instanceof ISubsystem) {
-            ISubsystem sub = (ISubsystem) mAuthority;
+            ISubsystem sub = mAuthority;
             IConfigStore authConfig = sub.getConfigStore();
 
             if (authConfig != null) {
@@ -293,7 +293,7 @@ public class SearchReqs extends CMSServlet {
             int count = 0;
 
             while (list != null && list.hasMoreElements()) {
-                IRequest request = (IRequest) list.nextRequestObject();
+                IRequest request = list.nextRequestObject();
 
                 if (request != null) {
                     count++;
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index d4801e794..ea0b10a67 100644
--- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
@@ -152,7 +152,7 @@ public class TokenServlet extends CMSServlet {
         ByteArrayOutputStream out = new ByteArrayOutputStream(s.length());
 
         for (int i = 0; i < s.length(); i++) {
-            int c = (int) s.charAt(i);
+            int c = s.charAt(i);
 
             if (c == '+') {
                 out.write(' ');
@@ -284,7 +284,7 @@ public class TokenServlet extends CMSServlet {
         if (!useSoftToken_s.equalsIgnoreCase("true"))
             useSoftToken_s = "false";
 
-        String rServersideKeygen = (String) req.getParameter("serversideKeygen");
+        String rServersideKeygen = req.getParameter("serversideKeygen");
         if (rServersideKeygen.equals("true")) {
             CMS.debug("TokenServlet: serversideKeygen requested");
             serversideKeygen = true;
diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
index 6c5211650..b4e03a7cc 100644
--- a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
@@ -88,7 +88,7 @@ public class WizardServlet extends VelocityServlet {
         Enumeration<IWizardPanel> e = mPanels.elements();
         Vector<IWizardPanel> panels = new Vector<IWizardPanel>();
         while (e.hasMoreElements()) {
-            IWizardPanel p = (IWizardPanel) e.nextElement();
+            IWizardPanel p = e.nextElement();
             panels.addElement(p);
         }
         context.put("panels", panels);
@@ -101,7 +101,7 @@ public class WizardServlet extends VelocityServlet {
         /* panel number starts from zero */
         int s = mPanels.size();
         for (int i = pno; i < s; i++) {
-            IWizardPanel panel = (IWizardPanel) mPanels.elementAt(i);
+            IWizardPanel panel = mPanels.elementAt(i);
             panel.cleanUp();
         }
     }