=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java	2016-01-08 06:55:43 +0000
@@ -28,21 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.query.Order;
 import org.hisp.dhis.schema.descriptors.CategoryOptionComboSchemaDescriptor;
 import org.hisp.dhis.webapi.controller.AbstractCrudController;
-import org.hisp.dhis.webapi.webdomain.WebMetaData;
-import org.hisp.dhis.webapi.webdomain.WebOptions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
@@ -51,26 +42,4 @@
 public class CategoryOptionComboController
     extends AbstractCrudController<DataElementCategoryOptionCombo>
 {
-    // need custom implementation of this since DataElementCategoryOptionCombo does not persist
-    // name (clashes with getAllOrderedName)
-    // FIXME add paging also for this?
-    @Override
-    protected List<DataElementCategoryOptionCombo> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters, List<Order> orders )
-    {
-        List<DataElementCategoryOptionCombo> entityList;
-
-        Date lastUpdated = options.getLastUpdated();
-
-        if ( lastUpdated != null )
-        {
-            entityList = new ArrayList<>( manager.getByLastUpdated( getEntityClass(), lastUpdated ) );
-        }
-        else
-        {
-            entityList = new ArrayList<>( manager.getAll( getEntityClass() ) );
-            Collections.sort( entityList, new IdentifiableObjectNameComparator() );
-        }
-
-        return entityList;
-    }
 }