diff --git a/website/client/src/components/static/communityGuidelines.vue b/website/client/src/components/static/communityGuidelines.vue
index da93f582b3..3b9451a7d3 100644
--- a/website/client/src/components/static/communityGuidelines.vue
+++ b/website/client/src/components/static/communityGuidelines.vue
@@ -33,8 +33,6 @@
       <li v-html="$t('commGuideList02E')"></li>
       <li v-html="$t('commGuideList02O')"></li>
       <li v-html="$t('commGuidePara037')"></li>
-      <li v-html="$t('commGuidePara02P')"></li>
-      <li v-html="$t('commGuidePara02Q')"></li>
       <li v-html="$t('commGuideList02M')"></li>
       <li v-html="$t('commGuideList02L')"></li>
       <li v-html="$t('commGuideList02J')"></li>
diff --git a/website/server/models/group.js b/website/server/models/group.js
index a3219476b5..fd01b440b3 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -50,7 +50,6 @@ export const { TAVERN_ID } = shared;
 const NO_CHAT_NOTIFICATIONS = [TAVERN_ID];
 const { LARGE_GROUP_COUNT_MESSAGE_CUTOFF } = shared.constants;
 const { MAX_SUMMARY_SIZE_FOR_GUILDS } = shared.constants;
-const { GUILDS_PER_PAGE } = shared.constants;
 
 const { CHAT_FLAG_LIMIT_FOR_HIDING } = shared.constants;
 
@@ -280,13 +279,12 @@ schema.statics.getGroup = async function getGroup (options = {}) {
   return group;
 };
 
-export const VALID_QUERY_TYPES = ['party', 'guilds', 'privateGuilds', 'publicGuilds', 'tavern'];
+export const VALID_QUERY_TYPES = ['party', 'guilds', 'privateGuilds', 'tavern'];
 
 schema.statics.getGroups = async function getGroups (options = {}) {
   const {
     user, types, groupFields = basicFields,
     sort = '-memberCount', populateLeader = false,
-    paginate = false, page = 0, // optional pagination for public guilds
     filters = {},
   } = options;
   const queries = [];
@@ -303,6 +301,7 @@ schema.statics.getGroups = async function getGroups (options = {}) {
         }));
         break;
       }
+      case 'guilds':
       case 'privateGuilds': {
         const query = {
           type: 'guild',
@@ -312,7 +311,7 @@ schema.statics.getGroups = async function getGroups (options = {}) {
           $or: [
             { 'purchased.plan.dateTerminated': null },
             { 'purchased.plan.dateTerminated': { $exists: false } },
-            { 'purchased.plan.dateTerminated': { $gt: new Date() }},
+            { 'purchased.plan.dateTerminated': { $gt: new Date() } },
           ],
         };
         _.assign(query, filters);