diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml
index 90d487894f..4c8951fb48 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml
@@ -138,7 +138,7 @@
             </property>
             <property name="clf:lastReclassifyBy">
                <title>Last user to reclassify this node</title>
-               <description>Identifier for the user who most recently reclassified this node</description>
+               <description>Free form text identifier for the user or entity who most recently reclassified this node</description>
                <type>d:text</type>
                <mandatory>false</mandatory>
             </property>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeService.java
index be76b5404f..0125b62992 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeService.java
@@ -89,6 +89,10 @@ public interface ClassificationSchemeService
      */
     Reclassification getReclassification(ClassificationLevel from, ClassificationLevel to);
 
+    /**
+     * Gets the allowed values for reclassification actions.
+     * @see Reclassification
+     */
     Set<String> getReclassificationValues();
 
     /** Types of reclassification. */
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
index 3979c97e45..5b72bdffd6 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
@@ -142,7 +142,7 @@ public class ClassificationSchemeServiceImpl extends ServiceBaseImpl implements
 
         if (from.equals(to))
         { return null; }
-        else if (fromIndex < lastIndex && toIndex == lastIndex)
+        else if (toIndex == lastIndex)
         {
             return Reclassification.DECLASSIFY;
         }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java
index 461ff8611e..be45c49d28 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java
@@ -58,10 +58,6 @@ public interface ClassifiedContentModel
     QName PROP_LAST_RECLASSIFY_AT = QName.createQName(CLF_URI, "lastReclassifyAt");
     QName PROP_LAST_RECLASSIFY_REASON = QName.createQName(CLF_URI, "lastReclassifyReason");
     QName PROP_LAST_RECLASSIFICATION_ACTION = QName.createQName(CLF_URI, "lastReclassificationAction");
-    /** Reclassification allowed values. */
-    String RECLASSIFICATION_UPGRADE    = "UPGRADE";
-    String RECLASSIFICATION_DOWNGRADE  = "DOWNGRADE";
-    String RECLASSIFICATION_DECLASSIFY = "DECLASSIFY";
 
     /** Security Clearance aspect. */
     QName ASPECT_SECURITY_CLEARANCE = QName.createQName(CLF_URI, "securityClearance");