=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2014-01-05 20:29:26 +0000
@@ -41,38 +41,126 @@
     // Attribute
     // -------------------------------------------------------------------------
 
+    /**
+     * Adds an attribute.
+     * 
+     * @param attribute the attribute.
+     */
     void addAttribute( Attribute attribute );
 
+    /**
+     * Updates an attribute.
+     * 
+     * @param attribute the attribute.
+     */
     void updateAttribute( Attribute attribute );
 
+    /**
+     * Deletes an attribute.
+     * 
+     * @param attribute the attribute.
+     */
     void deleteAttribute( Attribute attribute );
 
+    /**
+     * Gets the attribute with the given id.
+     * 
+     * @param id the attribute id.
+     * @return the attribute with the given id.
+     */
     Attribute getAttribute( int id );
 
+    /**
+     * Gets the attribute with the given uid.
+     * 
+     * @param id the attribute uid.
+     * @return the attribute with the given uid.
+     */
     Attribute getAttribute( String uid );
 
+    /**
+     * Gets the attribute with the given name.
+     * 
+     * @param name the name.
+     * @return the attribute with the given name.
+     */
     Attribute getAttributeByName( String name );
 
+    /**
+     * Gets all attributes.
+     * 
+     * @return a set of all attributes.
+     */
     Set<Attribute> getAllAttributes();
 
+    /**
+     * Gets attributes which are associated with data elements.
+     * 
+     * @return a set of attributes associated with data elements.
+     */
     Set<Attribute> getDataElementAttributes();
 
+    /**
+     * Gets attributes which are associated with data element groups.
+     * 
+     * @return a set of attributes associated with data element groups.
+     */
     Set<Attribute> getDataElementGroupAttributes();
 
+    /**
+     * Gets attributes which are associated with indicators.
+     * 
+     * @return a set of attributes associated with indicators.
+     */
     Set<Attribute> getIndicatorAttributes();
 
+    /**
+     * Gets attributes which are associated with data elements.
+     * 
+     * @return a set of attributes associated with data elements.
+     */
     Set<Attribute> getIndicatorGroupAttributes();
 
+    /**
+     * Gets attributes which are associated with organisation units.
+     * 
+     * @return a set of attributes associated with organisation units.
+     */
     Set<Attribute> getOrganisationUnitAttributes();
 
+    /**
+     * Gets attributes which are associated with organisation unit groups.
+     * 
+     * @return a set of attributes associated with organisation unit groups.
+     */
     Set<Attribute> getOrganisationUnitGroupAttributes();
 
+    /**
+     * Gets attributes which are associated with users.
+     * 
+     * @return a set of attributes which are associated with users.
+     */
     Set<Attribute> getUserAttributes();
 
+    /**
+     * Gets attributes which are associated with user groups.
+     * 
+     * @return a set of attributes which are associated with user groups.
+     */
     Set<Attribute> getUserGroupAttributes();
 
+    /**
+     * Gets the number of attributes.
+     * 
+     * @return the number of attributes.
+     */
     int getAttributeCount();
 
+    /**
+     * Gets the number of attributes with the given name.
+     * 
+     * @return the number of attributes with the given name.
+     */
     int getAttributeCountByName( String name );
 
     Set<Attribute> getAttributesBetween( int first, int max );
@@ -83,15 +171,46 @@
     // AttributeValue
     // -------------------------------------------------------------------------
 
+    /**
+     * Adds an attribute value.
+     * 
+     * @param attributeValue the attribute value.
+     */
     void addAttributeValue( AttributeValue attributeValue );
 
+    /**
+     * Updates an attribute value.
+     * 
+     * @param attributeValue the attribute value.
+     */
     void updateAttributeValue( AttributeValue attributeValue );
 
+    /**
+     * Deletes an attribute value.
+     * 
+     * @param attributeValue the attribute value.
+     */
     void deleteAttributeValue( AttributeValue attributeValue );
 
+    /**
+     * Gets the attribute value with the given id.
+     * 
+     * @param id the id.
+     * @return the attribute value with the given id.
+     */
     AttributeValue getAttributeValue( int id );
 
+    /**
+     * Gets all attribute values.
+     * 
+     * @return a set with all attribute values.
+     */
     Set<AttributeValue> getAllAttributeValues();
 
+    /**
+     * Gets the number of attribute values.
+     * 
+     * @return the number of attribute values.
+     */
     int getAttributeValueCount();
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java	2013-12-24 08:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java	2014-01-05 20:29:26 +0000
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.program.ProgramService;
 import org.hisp.dhis.sms.parse.ParserType;
 import org.hisp.dhis.smscommand.SMSCommand;
 import org.hisp.dhis.smscommand.SMSCommandService;
@@ -106,13 +105,6 @@
         this.userGroupID = userGroupID;
     }
 
-    private Integer selectedAnonymousProgramID;
-
-    public void setSelectedAnonymousProgramID( Integer selectedAnonymousProgramID )
-    {
-        this.selectedAnonymousProgramID = selectedAnonymousProgramID;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetPatientRegistrationFormListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetPatientRegistrationFormListAction.java	2013-12-31 03:05:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetPatientRegistrationFormListAction.java	2014-01-05 20:29:26 +0000
@@ -32,7 +32,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java	2013-12-28 14:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java	2014-01-05 20:29:26 +0000
@@ -31,7 +31,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;