Index: EXT/Optima/String.cls.xml
===================================================================
diff -u -r32003 -r32097
--- EXT/Optima/String.cls.xml	(.../String.cls.xml)	(revision 32003)
+++ EXT/Optima/String.cls.xml	(.../String.cls.xml)	(revision 32097)
@@ -4,62 +4,6 @@
 <ClassType>datatype</ClassType>
 <ProcedureBlock>0</ProcedureBlock>
 <Super>%String,EXT.Optima.Parameters</Super>
-
-<Method name="IsValid">
-<ClassMethod>1</ClassMethod>
-<CodeMode>generator</CodeMode>
-<FormalSpec>%val:%CacheString</FormalSpec>
-<GenerateAfter>IsValidDT</GenerateAfter>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>0</ServerOnly>
-<Implementation><![CDATA[
-			#; Validate MAXLEN parameter - either NULL, "", or a positive integer
-	If ($Get(%parameter("MAXLEN")) '= "") && (('$isvalidnum(%parameter("MAXLEN"),,1)) || (((+%parameter("MAXLEN")\1)) '= +%parameter("MAXLEN"))) { Quit $$$ERROR($$$DatatypeParameterIntegerNotPositive,%class_"::"_%property,"MAXLEN",%parameter("MAXLEN")) }
-		#; If subclass has a IsValidDT then call this
-	If %property'="",$$$comSubMemberDefined(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT"),$$$comSubMemberKeyGet(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT",$$$cXXXXorigin)'="%Library.DataType" {
-		Set %codemode=$$$cMETHCODEMODEEXPRESSION
-		Set %code="$select(##class("_%class_")."_%property_"IsValidDT(%val):1,1:$$$ERROR($$$DTFailure,%val))"
-		Quit $$$OK
-	}
-	n err,flag,sep,str
-	s %code=0
-	s %codemode=$$$cMETHCODEMODEEXPRESSION
-	i %parameter("VALUELIST")'="" d   QUIT $$$OK
-	. s sep=$e(%parameter("VALUELIST")) ;for now
-	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(%parameter("VALUELIST")_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(%parameter("VALUELIST"))_"))"
-	s str="",err=""
-	If %parameter("MINLEN")'="" {
-		Set str=str_"($s(%val'=$c(0):$length(%val),1:0)'<"_(+%parameter("MINLEN"))_")"
-		If %parameter("PATTERN")="",%parameter("MAXLEN")=""||(%parameter("TRUNCATE")) {
-			Set err="1"
-		} Else {
-			Set err="$s(%val'=$c(0):$length(%val),1:0)<"_(+%parameter("MINLEN"))
-		}
-		Set err=err_":$$$ERROR($$$DTMinLen,%val,"_(+%parameter("MINLEN"))_")"
-	}
-	If '%parameter("TRUNCATE"),%parameter("MAXLEN")'="" {
-		Set str=str_"&&($length(%val)'>"_(+%parameter("MAXLEN"))_")"
-		If %parameter("PATTERN")="" {
-			Set err=err_$select(err="":"",1:",")_"1"
-		} Else {
-			Set err=err_$select(err="":"",1:",")_"$length(%val)>"_(+%parameter("MAXLEN"))
-		}
-		Set err=err_":$$$ERROR($$$DTMaxLen,%val,"_(+%parameter("MAXLEN"))_")"
-	}
-	If %parameter("PATTERN")'="" Set str=str_"&&(%val?"_%parameter("PATTERN")_")",err=err_$select(err="":"",1:",")_"1:$$$ERROR($$$DTPattern,%val,"_$$$quote(%parameter("PATTERN"))_")"
-	i str="" s %code=1 QUIT $$$OK
-	i $e(str,1,2)="&&" s str=$e(str,3,*)
-	s %code="$select("_str_":1,"_err_")"
-	
-	new ValueList
-	if %parameter("OptimaEnu")'="" d  quit $$$OK
-	. set ValueList = ##class(TECH.ClassUtils).GetClassParameterValue(%parameter("OptimaEnu"),"VALUELIST")
-	. set sep = $e(ValueList)
-	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(ValueList_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(ValueList)_"))"
-
-	QUIT $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: EXT/Optima/Numeric.cls.xml
===================================================================
diff -u -r32004 -r32097
--- EXT/Optima/Numeric.cls.xml	(.../Numeric.cls.xml)	(revision 32004)
+++ EXT/Optima/Numeric.cls.xml	(.../Numeric.cls.xml)	(revision 32097)
@@ -4,53 +4,6 @@
 <ClassType>datatype</ClassType>
 <ProcedureBlock>0</ProcedureBlock>
 <Super>%Numeric,EXT.Optima.Parameters</Super>
-
-<Method name="IsValid">
-<ClassMethod>1</ClassMethod>
-<CodeMode>generator</CodeMode>
-<FormalSpec>%val:%CacheString</FormalSpec>
-<GenerateAfter>IsValidDT</GenerateAfter>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>0</ServerOnly>
-<Implementation><![CDATA[
-	if $Get(%parameter("SCALE")) < 0{ quit $$$ERROR($$$DatatypeParameterScaleNegative,%class,%property) }
-
-	#; If subclass has a IsValidDT then call this
-	If %property'="",$$$comSubMemberDefined(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT"),$$$comSubMemberKeyGet(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT",$$$cXXXXorigin)'="%Library.DataType" {
-		Set %codemode=$$$cMETHCODEMODEEXPRESSION
-		Set %code="$select(##class("_%class_")."_%property_"IsValidDT(%val):1,1:$$$ERROR($$$DTFailure,%val))"
-		Quit $$$OK
-	}
-	n sep,str,flag
-	s %code=0
-	s %codemode=$$$cMETHCODEMODEEXPRESSION
-	i %parameter("VALUELIST")'="" d   QUIT $$$OK
-	. s sep=$e(%parameter("VALUELIST")) ;for now
-	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(%parameter("VALUELIST")_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(%parameter("VALUELIST"))_"))"
-	s str="$isvalidnum(%val,"_%parameter("SCALE")_","_%parameter("MINVAL")_","_%parameter("MAXVAL")_")"
-	If %parameter("MAXVAL")="",%parameter("MINVAL")="" Set %code="$select("_str_":1,1:$$$ERROR($$$DTNotNum,%val))" Quit $$$OK
-	s %code="$select($zu(115,13)&&(%val=$c(0)):1,"_str_":1,'$isvalidnum(%val):$$$ERROR($$$DTNotNum,%val)"
-	If %parameter("MINVAL")'="" {
-		If %parameter("MAXVAL")="" {
-			Set %code=%code_",1:$$$ERROR($$$DTMinVal,%val,"_%parameter("MINVAL")_"))"
-		} Else {
-			Set %code=%code_",%val<"_%parameter("MINVAL")_":$$$ERROR($$$DTMinVal,%val,"_%parameter("MINVAL")_"),1:$$$ERROR($$$DTMaxVal,%val,"_%parameter("MAXVAL")_"))"
-		}
-	} Else {
-		Set %code=%code_",1:$$$ERROR($$$DTMaxVal,%val,"_%parameter("MAXVAL")_"))"
-	}
-	
-	new ValueList
-	if %parameter("OptimaEnu")'="" d  quit $$$OK
-	. set ValueList = ##class(TECH.ClassUtils).GetClassParameterValue(%parameter("OptimaEnu"),"VALUELIST")
-	. set sep = $e(ValueList)
-	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(ValueList_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(ValueList)_"))"
-
-	
-	
-	QUIT $$$OK
-]]></Implementation>
-</Method>
 </Class>