Index: openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql	2 Feb 2010 23:35:28 -0000	1.10
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql	14 Jun 2018 12:56:48 -0000	1.11
@@ -33,21 +33,6 @@
 </fullquery>
 
  
-<fullquery name="subsite::util::sub_type_exists_p.sub_type_exists_p">      
-      <querytext>
-      
-	select case 
-                 when exists (select 1 from acs_object_types 
-                              where supertype = :object_type)
-                 then 1 
-                 else 0 
-               end
-        from dual
-    
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="subsite::util::object_type_path_list.select_object_type_path">      
       <querytext>
       
@@ -59,20 +44,6 @@
       </querytext>
 </fullquery>
 
-    <fullquery name="subsite::get_application_options.package_types">
-        <querytext>
-
-    select pretty_name, package_key
-    from   apm_package_types
-    where  not (apm_package.singleton_p(package_key) = 1 and
-                apm_package.num_instances(package_key) >= 1)
-    and    implements_subsite_p = 'f'
-    and    package_type = 'apm_application'
-    order  by upper(pretty_name)
-
-        </querytext>
-    </fullquery>
- 
     <partialquery name="subsite::get_url.orderby">
         <querytext>
         and rownum < 2
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql	2 Feb 2010 23:35:28 -0000	1.12
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql	14 Jun 2018 12:56:48 -0000	1.13
@@ -34,21 +34,6 @@
 </fullquery>
 
  
-<fullquery name="subsite::util::sub_type_exists_p.sub_type_exists_p">      
-      <querytext>
-      
-	select case 
-                 when exists (select 1 from acs_object_types 
-                              where supertype = :object_type)
-                 then 1 
-                 else 0 
-               end
-        
-    
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="subsite::util::object_type_path_list.select_object_type_path">      
       <querytext>
 
@@ -61,20 +46,6 @@
       </querytext>
 </fullquery>
 
-    <fullquery name="subsite::get_application_options.package_types">
-        <querytext>
-
-    select pretty_name, package_key
-    from   apm_package_types
-    where  not (apm_package__singleton_p(package_key) = 1 and
-                apm_package__num_instances(package_key) >= 1)
-    and    not implements_subsite_p
-    and    package_type = 'apm_application'
-    order  by upper(pretty_name)
-
-        </querytext>
-    </fullquery>
- 
     <partialquery name="subsite::get_url.orderby">
         <querytext>
         order by case when host = :search_vhost then 1
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	9 May 2018 15:33:28 -0000	1.55
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	14 Jun 2018 12:56:48 -0000	1.56
@@ -387,9 +387,10 @@
     @author Oumi Mehrotra (oumi@arsdigita.com)
     @creation-date 2000-02-07
 } {
-
-    return [db_string sub_type_exists_p {}]
-
+    return [db_string sub_type_exists_p {
+        select exists (select 1 from acs_object_types 
+                              where supertype = :object_type) from dual
+    }]
 }
 
 
@@ -1122,8 +1123,15 @@
 ad_proc -public subsite::get_application_options {} {
     Gets options list for applications to install
 } {
-    set subsite_package_keys [join '[subsite::package_keys]' ","]
-    return [db_list_of_lists package_types {}]
+    return [db_list_of_lists package_types {
+        select pretty_name, package_key
+        from   apm_package_types t
+        where  not (singleton_p and exists (select 1 from apm_packages
+                                            where package_key = t.package_key))
+        and    implements_subsite_p = 'f'
+        and    package_type = 'apm_application'
+        order  by upper(pretty_name)
+    }]
 }
 
 ad_proc -private subsite::assert_user_may_add_member {} {
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/subsite-procs.xql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	7 Aug 2017 23:47:58 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	14 Jun 2018 12:56:48 -0000	1.14
@@ -26,26 +26,6 @@
 </fullquery>
 
  
-<fullquery name="subsite::instance_name_exists_p.select_name_exists_p">      
-      <querytext>
-      
-	select count(*) 
-	  from site_nodes
-	 where parent_id = :node_id
-	   and name = :instance_name
-    
-      </querytext>
-</fullquery>
- 
-<fullquery name="subsite::util::object_type_pretty_name.select_pretty_name">      
-      <querytext>
-      
-	select pretty_name from acs_object_types 
-	where object_type = :object_type
-    
-      </querytext>
-</fullquery>
-
     <fullquery name="subsite::get_url.get_vhost">
         <querytext>