=== added file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramIdentifierTypeDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramIdentifierTypeDeletionHandler.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramIdentifierTypeDeletionHandler.java	2014-01-09 11:44:02 +0000
@@ -0,0 +1,63 @@
+package org.hisp.dhis.program;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.Iterator;
+
+import org.hisp.dhis.system.deletion.DeletionHandler;
+
+public class ProgramIdentifierTypeDeletionHandler
+    extends DeletionHandler
+{
+    private ProgramPatientIdentifierTypeService programIdentifierTypeService;
+    
+    public void setProgramIdentifierTypeService( ProgramPatientIdentifierTypeService programIdentifierTypeService )
+    {
+        this.programIdentifierTypeService = programIdentifierTypeService;
+    }
+
+    @Override
+    public String getClassName()
+    {
+        return ProgramPatientIdentifierType.class.getSimpleName();
+    }
+
+    @Override
+    public void deleteProgram( Program program )
+    {
+        Iterator<ProgramPatientIdentifierType> iterator = program.getProgramPatientIdentifierTypes().iterator();
+        
+        while ( iterator.hasNext() )
+        {
+            ProgramPatientIdentifierType identifierType = iterator.next();
+            iterator.remove();
+            programIdentifierTypeService.deleteProgramPatientIdentifierType( identifierType );            
+        }
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2014-01-09 10:55:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2014-01-09 11:44:02 +0000
@@ -530,6 +530,12 @@
             ref="org.hisp.dhis.program.ProgramPatientAttributeService" />
     </bean>
 
+    <bean id="org.hisp.dhis.program.ProgramIdentifierTypeDeletionHandler"
+       class="org.hisp.dhis.program.ProgramIdentifierTypeDeletionHandler">
+        <property name="programIdentifierTypeService"
+            ref="org.hisp.dhis.program.ProgramPatientIdentifierTypeService" />
+    </bean>
+
 	<!-- DeletionManager -->
 
 	<bean
@@ -554,6 +560,7 @@
 					<ref local="org.hisp.dhis.program.ProgramValidationDeletionHandler" />
 					<ref local="org.hisp.dhis.program.ProgramDataEntryFormDeletionHandler" />
 					<ref local="org.hisp.dhis.program.ProgramAttributeDeletionHandler" />
+                    <ref local="org.hisp.dhis.program.ProgramIdentifierTypeDeletionHandler" />
 				</list>
 			</list>
 		</property>