Index: openacs-4/packages/acs-tcl/lib/page-error.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.xql,v
diff -u -N -r1.1 -r1.1.18.1
--- openacs-4/packages/acs-tcl/lib/page-error.xql	25 Feb 2005 16:30:59 -0000	1.1
+++ openacs-4/packages/acs-tcl/lib/page-error.xql	2 Jan 2016 01:20:50 -0000	1.1.18.1
@@ -17,33 +17,33 @@
       
     </querytext>
   </fullquery>
-  <fullquery name = "search_bug">
+  <fullquery name="search_bug">
     <querytext>
       select bug_id
       from bt_auto_bugs
       where error_file =:error_file
       and package_id = :bug_package_id
     </querytext>
   </fullquery>
-  <fullquery name = "insert_auto_bug">
+  <fullquery name="insert_auto_bug">
     <querytext>
       insert into bt_auto_bugs(bug_id, package_id, error_file)
       values (:bug_id, :bug_package_id, :error_file)
     </querytext>
   </fullquery>
-  <fullquery name = "increase_reported_times">
+  <fullquery name="increase_reported_times">
     <querytext>
         update bt_auto_bugs 
 	set times_reported = times_reported + 1 
 	where bug_id = :bug_id 
    </querytext>
   </fullquery>
-  <fullquery name = "select_times_reported">
+  <fullquery name="select_times_reported">
     <querytext>
       select times_reported 
       from bt_auto_bugs
       where bug_id = :bug_id 
     </querytext>
   </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v
diff -u -N -r1.17 -r1.17.8.1
--- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	25 Mar 2010 01:02:16 -0000	1.17
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	2 Jan 2016 01:20:51 -0000	1.17.8.1
@@ -151,18 +151,7 @@
     
       </querytext>
 </fullquery>
-
  
-<fullquery name="apm_package_version_installed_p.apm_package_version_installed_p">      
-      <querytext>
-      
-	select decode(count(*), 0, 0, 1) from apm_package_versions
-	where package_key = :package_key
-	and version_name = :version_name
-    
-      </querytext>
-</fullquery>
- 
 <fullquery name="apm_package_instance_new.invoke_new">
       <querytext>
       
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.28.8.1 -r1.28.8.2
--- openacs-4/packages/acs-tcl/tcl/apm-procs.xql	9 Sep 2015 14:12:38 -0000	1.28.8.1
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql	2 Jan 2016 01:20:51 -0000	1.28.8.2
@@ -20,18 +20,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_package_list_search_order.get_dependencies">
-    <querytext>
-      select apd.service_uri
-      from apm_package_versions apv, apm_package_dependencies apd
-      where apv.package_key = :package_key
-        and apv.installed_p = 't'
-        and apd.version_id = apv.version_id
-        and apd.dependency_type in ('extends', 'embeds')
-      order by apd.dependency_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="apm_package_list_url_resolution.get_inherit_templates_p">
     <querytext>
       select inherit_templates_p
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql,v
diff -u -N -r1.10 -r1.10.6.1
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	17 Oct 2010 21:06:09 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	2 Jan 2016 01:20:51 -0000	1.10.6.1
@@ -56,15 +56,6 @@
       </querytext>
 </fullquery>
  
-<fullquery name="apm_generate_package_spec.callback_info">      
-      <querytext>
-        select type,
-               proc
-        from apm_package_callbacks
-        where version_id = :version_id
-      </querytext>
-</fullquery>
- 
 <fullquery name="apm_generate_package_spec.parameter_info">      
       <querytext>