Index: TECH/ListUtils.cls.xml
===================================================================
diff -u -r2233 -r2626
--- TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 2233)
+++ TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 2626)
@@ -132,29 +132,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RemoveObjectFromList">
+<Method name="RemoveItemFromList">
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[Object,&List:%ListOfObjects]]></FormalSpec>
+<FormalSpec>Value:%CacheString,List:%CacheString,AllOccurences:%Boolean=0</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set Removed = 0
-	Set Index = 0
-	Set Iterator = ##class(TECH.ListIterator).%New(List)
-	Set i = 0
-	While (Iterator.HasNext() && (Index = 0))
-	{
-		Set i = i + 1
-		If (Iterator.Next() = Object)
-		{
-			Set Index = i
+	set Removed = 0
+	set Index = List.Previous("")
+	while (Index'="") && (AllOccurences || ('Removed)) {
+		if List.GetAt(Index) = Value {
+			do List.RemoveAt(Index)
+			set Removed = 1
 		}
+		set Index = List.Previous(Index)
 	}
-	If (Index > 0)
-	{
-		Do List.RemoveAt(Index)
-		Set Removed = 1
-	}
-	Quit Removed
+	quit Removed
 ]]></Implementation>
 </Method>
 
Index: APPS/PM/KenmMWFPlugin.cls.xml
===================================================================
diff -u -r1492 -r2626
--- APPS/PM/KenmMWFPlugin.cls.xml	(.../KenmMWFPlugin.cls.xml)	(revision 1492)
+++ APPS/PM/KenmMWFPlugin.cls.xml	(.../KenmMWFPlugin.cls.xml)	(revision 2626)
@@ -211,7 +211,7 @@
 					While (ObjectenIterator.HasNext())
 					{
 						Set Object = ObjectenIterator.Next()
-						Do ##class(TECH.ListUtils).RemoveObjectFromList(Object,ObjectenTeVerwijderenLijst)
+						Do ##class(TECH.ListUtils).RemoveItemFromList(Object,ObjectenTeVerwijderenLijst)
 					}
 				}
 			}
@@ -225,7 +225,7 @@
 				Set Lijst = PropertiesIndex.GetAt(Kenmerk).GetNext("")
 				For i=1:1:Lijst.Count()
 				{
-					Do ##class(TECH.ListUtils).RemoveObjectFromList(Lijst.GetAt(i),ObjectenTeVerwijderenLijst)
+					Do ##class(TECH.ListUtils).RemoveItemFromList(Lijst.GetAt(i),ObjectenTeVerwijderenLijst)
 					Do PropertiesIndex.GetAt(Kenmerk).RemoveAt(..GeefPropertyWaarde(Lijst.GetAt(i),Kenmerk))
 					Set $zobjproperty(Lijst.GetAt(i),Kenmerk) = ""
 					Do TeBewarenObjecten.Insert(Lijst.GetAt(i))
@@ -237,7 +237,7 @@
 			// Vermits deze alle permutaties gaat maken, moet dit niet gebeuren met de objecten die we toch gaan verwijderen.
 			For i=1:1:ObjectenTeVerwijderenLijst.Count()
 			{
-				Do ##class(TECH.ListUtils).RemoveObjectFromList(ObjectenTeVerwijderenLijst.GetAt(i),ObjectenLijst)
+				Do ##class(TECH.ListUtils).RemoveItemFromList(ObjectenTeVerwijderenLijst.GetAt(i),ObjectenLijst)
 				Do PropertiesIndex.GetAt(Kenmerk).RemoveAt(..GeefPropertyWaarde(ObjectenTeVerwijderenLijst.GetAt(i),Kenmerk))
 			}
 		}
Index: DOM/PM/impl/DataM/SamengesteldProduct.cls.xml
===================================================================
diff -u -r1478 -r2626
--- DOM/PM/impl/DataM/SamengesteldProduct.cls.xml	(.../SamengesteldProduct.cls.xml)	(revision 1478)
+++ DOM/PM/impl/DataM/SamengesteldProduct.cls.xml	(.../SamengesteldProduct.cls.xml)	(revision 2626)
@@ -125,7 +125,7 @@
 <FormalSpec>Bouwsteen:DOM.PM.Bouwsteen</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set IsVerwijderd = ##class(TECH.ListUtils).RemoveObjectFromList(Bouwsteen,..Bouwstenen)
+	Set IsVerwijderd = ##class(TECH.ListUtils).RemoveItemFromList(Bouwsteen,..Bouwstenen)
 	If (IsVerwijderd)
 	{
 		Do ..VerwijderdeBouwstenen.Insert(Bouwsteen)
Index: vhUnitTest/TECH/ListUtils.cls.xml
===================================================================
diff -u -r1074 -r2626
--- vhUnitTest/TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1074)
+++ vhUnitTest/TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 2626)
@@ -23,8 +23,6 @@
 
 <Method name="TestListbuildToList">
 <Implementation><![CDATA[
-
-	
 	set Listbuild = $listbuild("Item1","Item2","Item3")
 	set List = ##class(TECH.ListUtils).ListbuildToList(Listbuild)
 	
@@ -35,5 +33,72 @@
 	quit
 ]]></Implementation>
 </Method>
+
+<Method name="aTestRemoveItemFromList">
+<Implementation><![CDATA[
+	
+	set List = ##class(%ListOfDataTypes).%New()
+	do List.Insert("UnitTest1")
+	do List.Insert("UnitTest1")
+	do List.Insert("UnitTest2")
+	do List.Insert("UnitTest3")
+	
+	#define RemoveFirst 	0
+	
+	do ##class(TECH.ListUtils).RemoveItemFromList("UnitTest1",List,$$$RemoveFirst)
+	
+	do $$$AssertEquals(List.Size,3,"Test list")
+	do $$$AssertEquals(List.GetAt(1),"UnitTest1","Test listitem1")
+	do $$$AssertEquals(List.GetAt(2),"UnitTest2","Test listitem2")
+	
+	do List.Clear()
+	do List.Insert("UnitTest1")
+	do List.Insert("UnitTest1")
+	do List.Insert("UnitTest2")
+	do List.Insert("UnitTest3")
+	
+	#define RemoveAll	1
+	
+	do ##class(TECH.ListUtils).RemoveItemFromList("UnitTest1",List,$$$RemoveAll)
+	
+	do $$$AssertEquals(List.Size,2,"Test list")
+	do $$$AssertEquals(List.GetAt(1),"UnitTest2","Test listitem1")
+	do $$$AssertEquals(List.GetAt(2),"UnitTest3","Test listitem2")
+]]></Implementation>
+</Method>
+
+<Method name="TestRemoveItemFromListObject">
+<Implementation><![CDATA[
+	set List = ##class(%ListOfObjects).%New()
+	set Object1 = ##class(TestObject).%New()
+	set Object2 = ##class(TestObject).%New()
+	set Object3 = ##class(TestObject).%New()
+	do List.Insert(Object1)
+	do List.Insert(Object1)
+	do List.Insert(Object2)
+	do List.Insert(Object3)
+	
+	#define RemoveFirst 	0
+	
+	do ##class(TECH.ListUtils).RemoveItemFromList(Object1,List,$$$RemoveFirst)
+	
+	do $$$AssertEquals(List.Size,3,"Test list")
+	do $$$AssertEquals(List.GetAt(1),Object1,"Test listitem1")
+	do $$$AssertEquals(List.GetAt(2),Object2,"Test listitem2")
+	
+	do List.Clear()
+	do List.Insert(Object1)
+	do List.Insert(Object1)
+	do List.Insert(Object2)
+	do List.Insert(Object3)
+	
+	#define RemoveAll	1
+	
+	do ##class(TECH.ListUtils).RemoveItemFromList(Object1,List,$$$RemoveAll)
+	do $$$AssertEquals(List.Size,2,"Test list")
+	do $$$AssertEquals(List.GetAt(1),Object2,"Test listitem1")
+	do $$$AssertEquals(List.GetAt(2),Object3,"Test listitem2")
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/TECH/TestObject.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/TestObject.cls.xml	(revision 0)
+++ vhUnitTest/TECH/TestObject.cls.xml	(revision 2626)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.TestObject">
+<Description>
+</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+</Class>
+</Export>
Index: APPS/PM/Maatwerk/TBX/Frees/ErrorHandler.cls.xml
===================================================================
diff -u -r1073 -r2626
--- APPS/PM/Maatwerk/TBX/Frees/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1073)
+++ APPS/PM/Maatwerk/TBX/Frees/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 2626)
@@ -85,7 +85,7 @@
 <Method name="VerwijderErrorHandlerObserver">
 <FormalSpec>Observer:APPS.PM.Maatwerk.TBX.Frees.ErrorHandlerObserver</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListUtils).RemoveObjectFromList(Observer,..Observers)
+<Implementation><![CDATA[	Quit ##class(TECH.ListUtils).RemoveItemFromList(Observer,..Observers)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/EC/Winkelkar/Winkelkar.cls.xml
===================================================================
diff -u -r2011 -r2626
--- DOM/EC/Winkelkar/Winkelkar.cls.xml	(.../Winkelkar.cls.xml)	(revision 2011)
+++ DOM/EC/Winkelkar/Winkelkar.cls.xml	(.../Winkelkar.cls.xml)	(revision 2626)
@@ -177,7 +177,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = $$$OK
-	Set IsVerwijderd = ##class(TECH.ListUtils).RemoveObjectFromList(Lijn,..Inhoud)
+	Set IsVerwijderd = ##class(TECH.ListUtils).RemoveItemFromList(Lijn,..Inhoud)
 	If ('IsVerwijderd) { Set Status = $$$ERROR($$$GeneralError,"Te verwijderen lijn niet gevonden") }
 	Quit Status
 ]]></Implementation>