Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -N -r1.114.2.15 -r1.114.2.16
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	17 Oct 2020 07:20:35 -0000	1.114.2.15
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	17 Oct 2020 16:47:14 -0000	1.114.2.16
@@ -1123,15 +1123,24 @@
     {-callback apm_dummy_callback}
     {-package_key ""}
     {-parameter ""}
-    parameter_id
+    {-parameter_id ""}
 } {
     Unregisters a parameter from the system.
 } {
     if { $parameter_id eq "" } {
-        set parameter_id [db_string select_parameter_id {}]
+        set parameter_id [db_string select_parameter_id {
+            select parameter_id
+            from apm_parameters
+            where package_key = :package_key
+            and parameter_name = :parameter
+        }]
     }
 
-    db_1row get_scope_and_name {}
+    db_1row get_scope_and_name {
+        select scope, parameter_name
+        from apm_parameters
+        where parameter_id = :parameter_id
+    }
 
     ns_log Debug "apm_parameter_unregister: Unregistering parameter $parameter_id."
 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.xql,v
diff -u -N -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/acs-tcl/tcl/apm-procs.xql	8 Jan 2020 12:05:11 -0000	1.30.2.2
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql	17 Oct 2020 16:47:14 -0000	1.30.2.3
@@ -134,23 +134,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_parameter_unregister.select_parameter_id">
-    <querytext>
-      select parameter_id
-      from apm_parameters
-      where package_key = :package_key
-        and parameter_name = :parameter
-    </querytext>
-  </fullquery>
-
-  <fullquery name="apm_parameter_unregister.get_scope_and_name">
-    <querytext>
-      select scope, parameter_name
-      from apm_parameters
-      where parameter_id = :parameter_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="apm_parameter_unregister.all_parameters_packages">
     <querytext>
       select package_id, parameter_id, parameter_name