diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 1d6d7788839..35fa620859e 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.6.19
+
+### Patch Changes
+
+- [#1674](https://github.com/bluesky-social/atproto/pull/1674) [`35b616cd`](https://github.com/bluesky-social/atproto/commit/35b616cd82232879937afc88d3f77d20c6395276) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Strip leading `#` from from detected tag facets
+
 ## 0.6.18
 
 ### Patch Changes
diff --git a/packages/pds/src/api/app/bsky/simple.ts b/packages/pds/src/api/app/bsky/simple.ts
deleted file mode 100644
index 4603895228e..00000000000
--- a/packages/pds/src/api/app/bsky/simple.ts
+++ /dev/null
@@ -1,383 +0,0 @@
-import { Server } from '../../../lexicon'
-import AppContext from '../../../context'
-
-export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.actor.getSuggestions({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.actor.getSuggestions(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.actor.searchActors({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.actor.searchActors(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.actor.searchActorsTypeahead({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res =
-        await ctx.appViewAgent.api.app.bsky.actor.searchActorsTypeahead(
-          params,
-          await ctx.serviceAuthHeaders(requester),
-        )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getActorFeeds({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getActorFeeds(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getFeed({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const { data: feed } =
-        await ctx.appViewAgent.api.app.bsky.feed.getFeedGenerator(
-          { feed: params.feed },
-          await ctx.serviceAuthHeaders(requester),
-        )
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getFeed(
-        params,
-        await ctx.serviceAuthHeaders(requester, feed.view.did),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getFeedGenerator({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getFeedGenerator(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getFeedGenerators({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getFeedGenerators(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getPosts({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getPosts(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getLikes({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getLikes(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.feed.getRepostedBy({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.feed.getRepostedBy(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.unspecced.getPopularFeedGenerators({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res =
-        await ctx.appViewAgent.api.app.bsky.unspecced.getPopularFeedGenerators(
-          params,
-          await ctx.serviceAuthHeaders(requester),
-        )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getBlocks({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getBlocks(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getFollowers({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getFollowers(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getFollows({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getFollows(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getList({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getList(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getListMutes({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getListMutes(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getListBlocks({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getListBlocks(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getLists({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getLists(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.getMutes({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res = await ctx.appViewAgent.api.app.bsky.graph.getMutes(
-        params,
-        await ctx.serviceAuthHeaders(requester),
-      )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.graph.muteActor({
-    auth: ctx.accessVerifier,
-    handler: async ({ input, auth }) => {
-      const requester = auth.credentials.did
-      await ctx.appViewAgent.api.app.bsky.graph.muteActor(input.body, {
-        ...(await ctx.serviceAuthHeaders(requester)),
-        encoding: 'application/json',
-      })
-    },
-  })
-
-  server.app.bsky.graph.muteActorList({
-    auth: ctx.accessVerifier,
-    handler: async ({ input, auth }) => {
-      const requester = auth.credentials.did
-      await ctx.appViewAgent.api.app.bsky.graph.muteActorList(input.body, {
-        ...(await ctx.serviceAuthHeaders(requester)),
-        encoding: 'application/json',
-      })
-    },
-  })
-
-  server.app.bsky.graph.unmuteActor({
-    auth: ctx.accessVerifier,
-    handler: async ({ input, auth }) => {
-      const requester = auth.credentials.did
-      await ctx.appViewAgent.api.app.bsky.graph.unmuteActor(input.body, {
-        ...(await ctx.serviceAuthHeaders(requester)),
-        encoding: 'application/json',
-      })
-    },
-  })
-
-  server.app.bsky.graph.unmuteActorList({
-    auth: ctx.accessVerifier,
-    handler: async ({ input, auth }) => {
-      const requester = auth.credentials.did
-      await ctx.appViewAgent.api.app.bsky.graph.unmuteActorList(input.body, {
-        ...(await ctx.serviceAuthHeaders(requester)),
-        encoding: 'application/json',
-      })
-    },
-  })
-
-  server.app.bsky.notification.getUnreadCount({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res =
-        await ctx.appViewAgent.api.app.bsky.notification.getUnreadCount(
-          params,
-          await ctx.serviceAuthHeaders(requester),
-        )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.notification.listNotifications({
-    auth: ctx.accessVerifier,
-    handler: async ({ params, auth }) => {
-      const requester = auth.credentials.did
-      const res =
-        await ctx.appViewAgent.api.app.bsky.notification.listNotifications(
-          params,
-          await ctx.serviceAuthHeaders(requester),
-        )
-      return {
-        encoding: 'application/json',
-        body: res.data,
-      }
-    },
-  })
-
-  server.app.bsky.notification.updateSeen({
-    auth: ctx.accessVerifier,
-    handler: async ({ input, auth }) => {
-      const requester = auth.credentials.did
-      await ctx.appViewAgent.api.app.bsky.notification.updateSeen(input.body, {
-        ...(await ctx.serviceAuthHeaders(requester)),
-        encoding: 'application/json',
-      })
-    },
-  })
-}