remove code that is no longer used in unfold, because unfold is no longer

used by module trans (now uses copy)

frontend/mergecases.icl

@@ -203,9 +203,8 @@ where
 			= (Case {cees & case_info_ptr=new_case_info_ptr},symbol_heap)
 
 	replace_variables_in_expression expr var_heap symbol_heap
-		# us = { us_var_heap = var_heap, us_symbol_heap = symbol_heap, us_opt_type_heaps = No,us_cleanup_info = [], us_local_macro_functions = No }
-		  ui = {ui_handle_aci_free_vars = RemoveThem}
-		  (expr, us) = unfold expr ui us
+		# us = { us_var_heap = var_heap, us_symbol_heap = symbol_heap, us_local_macro_functions = No }
+		  (expr, us) = unfold expr us
 		= (expr, us.us_var_heap, us.us_symbol_heap)
 
 	new_variable fv=:{fv_ident, fv_info_ptr} var_heap
@@ -378,9 +377,8 @@ where
 	
 	replace_variables vars expr ap_vars var_heap symbol_heap
 		# var_heap = build_aliases vars ap_vars var_heap
-		# us = { us_var_heap = var_heap, us_symbol_heap = symbol_heap, us_opt_type_heaps = No,us_cleanup_info=[], us_local_macro_functions = No }
-		  ui = {ui_handle_aci_free_vars = RemoveThem }
-		  (expr, us) = unfold expr ui us
+		# us = { us_var_heap = var_heap, us_symbol_heap = symbol_heap, us_local_macro_functions = No }
+		  (expr, us) = unfold expr us
 		= (expr, us.us_var_heap, us.us_symbol_heap)
 	where
 		build_aliases [var1 : vars1] [ {fv_ident,fv_info_ptr} : vars2 ] var_heap

frontend/transform.dcl

@@ -31,16 +31,8 @@ determineVariablesAndRefCounts :: ![FreeVar] !Expression !*CollectState -> (!Exp
 ::	UnfoldState =
 	{	us_var_heap				:: !.VarHeap
 	,	us_symbol_heap			:: !.ExpressionHeap
-	,	us_opt_type_heaps		:: !.Optional .TypeHeaps,
-		us_cleanup_info			:: ![ExprInfoPtr],
-		us_local_macro_functions :: !Optional CopiedLocalFunctions
+	,	us_local_macro_functions :: !Optional CopiedLocalFunctions
 	}
 
-::	UnfoldInfo =
-	{	ui_handle_aci_free_vars	:: !AciFreeVarHandleMode
-	}
-
-:: AciFreeVarHandleMode = LeaveThem | RemoveThem | SubstituteThem
-
-class unfold a :: !a !UnfoldInfo !*UnfoldState -> (!a, !*UnfoldState)
+class unfold a :: !a !*UnfoldState -> (!a, !*UnfoldState)
 instance unfold Expression, CasePatterns