diff --git a/components/HeroContainer.tsx b/components/HeroContainer.tsx
index 48c27111..552582fb 100644
--- a/components/HeroContainer.tsx
+++ b/components/HeroContainer.tsx
@@ -2,7 +2,12 @@ import { GitHubIcon } from "./GitHubIcon";
 import { HappyCommitsInfo } from "./HappyCommitsInfo";
 import { BinaryCode } from "./BinaryCode";
 
-export const HeroContainer = ({filter, setFilter}) => {
+type FilterProps = {
+  filter: string;
+  setFilter: (filter: string) => void;
+};
+
+export const HeroContainer = ({filter, setFilter}: FilterProps) => {
   return (
     <>
       <div
diff --git a/components/IssueItem.tsx b/components/IssueItem.tsx
index b83fdb53..4650bb56 100644
--- a/components/IssueItem.tsx
+++ b/components/IssueItem.tsx
@@ -1,25 +1,9 @@
-import { faComment } from "@fortawesome/free-regular-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
 import { Issue } from "../types";
 
 type IssueItemProps = {
   issue: Issue;
 };
 
-type IssueCommentNumProps = {
-  numIssues: number;
-};
-
-// const IssueCommentNum = ({ numIssues }: IssueCommentNumProps) => {
-//   return (
-//     <div className="flex flex-row items-center justify-end mt-1 w-10">
-//       <span className="mr-2 text-sm leading-snug">{numIssues}</span>
-//       <FontAwesomeIcon icon={faComment} />
-//     </div>
-//   );
-// };
-
 export const IssueItem = ({ issue }: IssueItemProps) => {
   return (
     <li key={issue.url} className="px-6 py-2 bg-white justify-start items-start gap-4 inline-flex">
@@ -35,7 +19,6 @@ export const IssueItem = ({ issue }: IssueItemProps) => {
         >
           {issue.title}
         </a>
-        {/* {issue.comments_count > 0 && <IssueCommentNum numIssues={issue.comments_count} />} */}
       </div>
     </li>
   );
diff --git a/components/RepositoryMetadata.tsx b/components/RepositoryMetadata.tsx
index 2f4d4699..d03bd9b7 100644
--- a/components/RepositoryMetadata.tsx
+++ b/components/RepositoryMetadata.tsx
@@ -43,7 +43,7 @@ export const RepositoryMetadata = ({
         </div>
         <div className="px-2 py-1 bg-violet-50 rounded justify-center items-center gap-2 flex">
           <div className="text-slate-700 text-[13px] font-normal font-['Source Sans Pro']">
-            SDG-1
+            {repositoryTopics && repositoryTopics.map(topic => topic.display).join(', ')}
           </div>
         </div>
       </div>
diff --git a/pages/index.tsx b/pages/index.tsx
index 77b2637b..e2d46014 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -16,7 +16,7 @@ export default function Home() {
         <title>Happy Commits | Make your next open-source contribution matter.</title>
       </Head>
       <Navbar />
-      <HeroContainer filter={filter} setFilter={setFilter} repositories={repositories} />
+      <HeroContainer filter={filter} setFilter={setFilter} />
       <RepositoryList repositories={repositories} filter={filter} />
     </>
   );
diff --git a/pages/language/[tag].tsx b/pages/language/[tag].tsx
deleted file mode 100644
index b5446f1b..00000000
--- a/pages/language/[tag].tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { GetStaticPaths, GetStaticProps } from "next";
-import Head from "next/head";
-import { ParsedUrlQuery } from "querystring";
-
-import { RepositoryList } from "../../components/RepositoryList";
-import data from "../../generated.json";
-import { useAppData } from "../../hooks/useAppData";
-
-interface Params extends ParsedUrlQuery {
-  tag: string;
-}
-
-type LanguageProps = {
-  tag: Params["tag"];
-};
-
-export const getStaticPaths: GetStaticPaths<Params> = async () => {
-  return {
-    paths: data.languages.map((language) => ({
-      params: { tag: language.id }
-    })),
-    fallback: false
-  };
-};
-
-export const getStaticProps: GetStaticProps<LanguageProps, Params> = async ({
-  params = {} as Params
-}) => {
-  return {
-    props: { tag: params.tag }
-  };
-};
-
-export default function Language({ tag }: LanguageProps) {
-  const { repositories, languages } = useAppData();
-
-  const language = languages.find((language) => language.id === tag);
-  const pageTitle = `First Issue | ${language?.display} Language`;
-
-  return (
-    <>
-      <Head>
-        <title>{pageTitle}</title>
-      </Head>
-      <RepositoryList
-        repositories={repositories.filter((repository) => repository.language.id === tag)}
-      />
-    </>
-  );
-}
diff --git a/pages/search/[tag].tsx b/pages/search/[tag].tsx
deleted file mode 100644
index 13d7e097..00000000
--- a/pages/search/[tag].tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import Head from "next/head";
-import { useRouter } from "next/router";
-
-import { RepositoryList } from "../../components/RepositoryList";
-import { useAppData } from "../../hooks/useAppData";
-import { CountableTag } from "../../types";
-
-export default function Language() {
-  const { repositories, languages, topics } = useAppData();
-
-  const router = useRouter();
-  const { query } = router.query;
-
-  const pageTitle = `First Issue | Search ${query}`;
-
-  const queriedLanguages = languages.filter((language: CountableTag) =>
-    language.display?.toLowerCase().includes(query as string)
-  );
-  const queriedTopics = topics.filter((topic: CountableTag) =>
-    topic.display?.toLowerCase().includes(query as string)
-  );
-  const queriedRepositories = repositories.filter(
-    (repository) =>
-      repository.owner.toLowerCase().includes(query as string) ||
-      repository.name.toLowerCase().includes(query as string) ||
-      repository.language.display?.toLowerCase().includes(query as string) ||
-      repository.topics?.some((topic) => topic.display?.toLowerCase().includes(query as string)) ||
-      repository.issues?.some((issue) => issue.title.toLowerCase().includes(query as string))
-  );
-
-  // show repositories that have the tag in either title, description, language or topics or issues
-  return (
-    <>
-      <Head>
-        <title>{pageTitle}</title>
-      </Head>
-      <RepositoryList repositories={queriedRepositories} />
-      {queriedLanguages}
-      {queriedTopics}
-    </>
-  );
-}
diff --git a/pages/topic/[tag].tsx b/pages/topic/[tag].tsx
deleted file mode 100644
index 75b69596..00000000
--- a/pages/topic/[tag].tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { GetStaticPaths, GetStaticProps } from "next";
-import Head from "next/head";
-import { ParsedUrlQuery } from "querystring";
-
-import { RepositoryList } from "../../components/RepositoryList";
-import data from "../../generated.json";
-import { useAppData } from "../../hooks/useAppData";
-
-interface Params extends ParsedUrlQuery {
-  tag: string;
-}
-
-type TopicProps = {
-  tag: Params["tag"];
-};
-
-export const getStaticPaths: GetStaticPaths<Params> = async () => {
-  return {
-    paths: data.topics.map((topic) => ({
-      params: { tag: topic.id }
-    })),
-    fallback: false
-  };
-};
-
-export const getStaticProps: GetStaticProps<TopicProps, Params> = async ({
-  params = {} as Params
-}) => {
-  return {
-    props: { tag: params.tag }
-  };
-};
-
-export default function Topic({ tag }: TopicProps) {
-  const { repositories, topics } = useAppData();
-
-  const topic = topics.find((topic) => topic.id === tag);
-  const pageTitle = `First Issue | Topic ${topic?.display}`;
-
-  return (
-    <>
-      <Head>
-        <title>{pageTitle}</title>
-      </Head>
-      <RepositoryList
-        repositories={repositories.filter((repository) =>
-          repository.topics?.some((topic) => topic.id === tag)
-        )}
-      />
-    </>
-  );
-}