=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ViewProgramEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ViewProgramEntryFormAction.java	2015-06-19 07:35:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ViewProgramEntryFormAction.java	2015-06-19 09:42:38 +0000
@@ -39,7 +39,6 @@
 import org.hisp.dhis.program.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
 import org.hisp.dhis.user.UserSettingService;
 
 import com.opensymphony.xwork2.Action;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2015-06-19 07:35:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2015-06-19 09:42:38 +0000
@@ -482,18 +482,6 @@
   <!-- Program Data Entry Form -->
 
   <bean
-    id="org.hisp.dhis.trackedentity.action.dataentryform.RemoveProgramEntryFormAction"
-    class="org.hisp.dhis.trackedentity.action.dataentryform.RemoveProgramEntryFormAction"
-    scope="prototype">
-    <property name="programService">
-      <ref bean="org.hisp.dhis.program.ProgramService" />
-    </property>
-    <property name="dataEntryFormService">
-      <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
-    </property>
-  </bean>
-
-  <bean
     id="org.hisp.dhis.trackedentity.action.dataentryform.SaveProgramEntryFormAction"
     class="org.hisp.dhis.trackedentity.action.dataentryform.SaveProgramEntryFormAction"
     scope="prototype">