Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -N -r1.81.2.13 -r1.81.2.14
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	5 Dec 2021 15:36:21 -0000	1.81.2.13
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	5 Jan 2022 13:10:51 -0000	1.81.2.14
@@ -350,37 +350,6 @@
     return 1
 }
 
-ad_proc ad_pretty_mailing_address_from_args {
-    line1
-    line2
-    city
-    state
-    postal_code
-    country_code
-} {
-    Returns a prettily formatted address with country name, given
-    an address.
-
-    @author Unknown
-    @author Roberto Mello
-} {
-    set lines [list]
-    if { $line2 eq "" } {
-        lappend lines $line1
-    } elseif { $line1 eq "" } {
-        lappend lines $line2
-    } else {
-        lappend lines $line1
-        lappend lines $line2
-    }
-    lappend lines "$city, $state $postal_code"
-    if { $country_code ne "" && $country_code ne "us" } {
-        lappend lines [ad_country_name_from_country_code $country_code]
-    }
-    return [join $lines "\n"]
-}
-
-
 # for pages that have optional decoration
 
 ad_proc ad_decorate_top {
Index: openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl,v
diff -u -N -r1.29.2.18 -r1.29.2.19
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	28 Dec 2021 13:13:47 -0000	1.29.2.18
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	5 Jan 2022 13:10:52 -0000	1.29.2.19
@@ -4077,6 +4077,54 @@
     return $keys
 }
 
+
+#
+# The following proc is based on undefined function 
+#
+#
+# -------------------------------------------------------
+# missing function "ad_serve_html_page"
+#ad_proc -private rp_handle_html_request {} {
+#
+#    Handles a request for an HTML file.
+#
+#} {
+#    ad_serve_html_page [ad_conn file]
+#}
+
+# -------------------------------------------------------
+# missing function "ad_country_name_from_country_code"
+#
+# ad_proc ad_pretty_mailing_address_from_args {
+#     line1
+#     line2
+#     city
+#     state
+#     postal_code
+#     country_code
+# } {
+#     Returns a prettily formatted address with country name, given
+#     an address.
+#
+#     @author Unknown
+#     @author Roberto Mello
+# } {
+#     set lines [list]
+#     if { $line2 eq "" } {
+#         lappend lines $line1
+#     } elseif { $line1 eq "" } {
+#         lappend lines $line2
+#     } else {
+#         lappend lines $line1
+#         lappend lines $line2
+#     }
+#     lappend lines "$city, $state $postal_code"
+#     if { $country_code ne "" && $country_code ne "us" } {
+#         lappend lines [ad_country_name_from_country_code $country_code]
+#     }
+#     return [join $lines "\n"]
+# }
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -N -r1.153.2.44 -r1.153.2.45
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	28 Dec 2021 16:39:44 -0000	1.153.2.44
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	5 Jan 2022 13:10:52 -0000	1.153.2.45
@@ -1804,14 +1804,6 @@
     source [ad_conn file]
 }
 
-ad_proc -private rp_handle_html_request {} {
-
-    Handles a request for an HTML file.
-
-} {
-    ad_serve_html_page [ad_conn file]
-}
-
 if { [apm_first_time_loading_p] } {
     # Initialize nsv_sets