diff --git a/website/client/src/components/static/communityGuidelines.vue b/website/client/src/components/static/communityGuidelines.vue
index 3b9451a7d3..da93f582b3 100644
--- a/website/client/src/components/static/communityGuidelines.vue
+++ b/website/client/src/components/static/communityGuidelines.vue
@@ -33,6 +33,8 @@
       <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/client/src/mixins/guide.js b/website/client/src/mixins/guide.js
index 0234196f6b..0bc7d4d0b7 100644
--- a/website/client/src/mixins/guide.js
+++ b/website/client/src/mixins/guide.js
@@ -53,15 +53,6 @@ export default {
             hideNavigation: true,
           },
         ]],
-        tavern: [[
-          {
-            orphan: true,
-            intro: this.$t('tourTavernPage'),
-            final: true,
-            proceed: this.$t('awesome'),
-            hideNavigation: true,
-          },
-        ]],
         party: [[
           {
             orphan: true,
@@ -71,11 +62,6 @@ export default {
             hideNavigation: true,
           },
         ]],
-        guilds: [[
-          {
-            intro: this.$t('tourGuildsPage'),
-          },
-        ]],
         challenges: [[
           {
             intro: this.$t('tourChallengesPage'),
@@ -129,9 +115,7 @@ export default {
       switch (this.$route.name) { // eslint-disable-line default-case
         // case 'options.profile.avatar':   return goto('intro', 5);
         case 'stats': return this.goto('stats', 0);
-        case 'tavern': return this.goto('tavern', 0);
         case 'party': return this.goto('party', 0);
-        case 'guildsDiscovery': return this.goto('guilds', 0);
         case 'challenges': return this.goto('challenges', 0);
         case 'patrons': return this.goto('hall', 0);
         case 'items': return this.goto('market', 0);
diff --git a/website/common/locales/en/communityGuidelines.json b/website/common/locales/en/communityGuidelines.json
index e60599ade7..69a7836cd1 100644
--- a/website/common/locales/en/communityGuidelines.json
+++ b/website/common/locales/en/communityGuidelines.json
@@ -21,6 +21,8 @@
   "commGuideList02E": "<strong>If a staff member tells you that a term is disallowed on Habitica, even if it is a term that you did not realize was problematic, that decision is final.</strong> Additionally, slurs will be dealt with very severely, as they are also a violation of the Terms of Service.",
   "commGuideList02O": "<strong>Parties may create their own chat rules for members’ comfort and preferences</strong>. However, the admins cannot enforce chat rules in these private spaces unless there is a breach of the Terms of Service, including harassment. If someone in your Party is causing issues, we encourage the Party leader to remove them.",
   "commGuidePara037": "<strong>No Parties or Groups should be created for the purpose of attacking any group or individual</strong>. Fight bad habits, not your fellow adventurers!",
+  "commGuideList02P": "<strong>We discourage the sending of unsolicited private messages</strong>. If you receive an unwanted message that makes you uncomfortable or that breaks these Guidelines or the Terms of Service, please block the sender and report it to bring it to Staff attention.",
+  "commGuideList02Q": "<strong>Do not try to get around a block</strong>. If someone has blocked you from sending them private messages, do not contact them elsewhere to ask them to unblock you.",
   "commGuideList02M": "<strong>Do not ask or beg for Gems, subscriptions, or membership in Group Plans</strong>. If you see or receive unwanted messages asking for paid items, please report them. Repeated Gem or subscription begging, especially after a warning, may result in an account ban.",
   "commGuideList02L": "<strong>We highly discourage the exchange of personal information--particularly information that can be used to identify you</strong>. Identifying information can include but is not limited to: your address, your email, and your password or API token. If you are asked for personal information in a Party chat or private message, we highly recommend that you do not respond, and alert the Staff by either reporting the message or contacting <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with screenshots of the messages if more context is needed.",
   "commGuideList02J": "<strong>Do not spam</strong>. Spamming may include, but is not limited to: sending multiple unsolicited private messages, sending nonsensical messages, sending multiple promotional messages about a Party or Challenge, or creating multiple similar or low quality Challenges in a row. Staff has discretion to determine what messages are considered spamming.",