=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-03 15:30:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-03 17:49:15 +0000
@@ -216,7 +216,6 @@
 
     public DataElement()
     {
-
     }
 
     public DataElement( String name )

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java	2015-08-25 21:48:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java	2015-09-03 17:49:15 +0000
@@ -52,12 +52,7 @@
 public class TrackedEntityInstance
     extends BaseIdentifiableObject
 {
-    public static String SEARCH_SAPERATE = "_";
     public static String PREFIX_TRACKED_ENTITY_ATTRIBUTE = "attr";
-    public static String PREFIX_PROGRAM = "prg";
-    public static String PREFIX_PROGRAM_INSTANCE = "pi";
-    public static String PREFIX_PROGRAM_EVENT_BY_STATUS = "stat";
-    public static String PREFIX_PROGRAM_STAGE = "prgst";
 
     private Set<TrackedEntityAttributeValue> attributeValues = new HashSet<>();