diff --git a/torchci/components/benchmark/BranchAndCommitPicker.tsx b/torchci/components/benchmark/BranchAndCommitPicker.tsx
index c957a4d566..b2f6ab62e8 100644
--- a/torchci/components/benchmark/BranchAndCommitPicker.tsx
+++ b/torchci/components/benchmark/BranchAndCommitPicker.tsx
@@ -9,7 +9,6 @@ import {
 import { MAIN_BRANCH, SHA_DISPLAY_LENGTH } from "components/benchmark/common";
 import dayjs from "dayjs";
 import { fetcher } from "lib/GeneralUtils";
-import { RocksetParam } from "lib/rockset";
 import { useEffect } from "react";
 import useSWR from "swr";
 
@@ -48,7 +47,6 @@ function groupCommitByBranch(data: any) {
 
 export function BranchAndCommitPicker({
   queryName,
-  queryCollection,
   queryParams,
   branch,
   setBranch,
@@ -57,11 +55,9 @@ export function BranchAndCommitPicker({
   titlePrefix,
   fallbackIndex,
   timeRange,
-  useClickHouse,
 }: {
   queryName: string;
-  queryCollection: string;
-  queryParams: RocksetParam[] | {};
+  queryParams: { [k: string]: any };
   branch: string;
   setBranch: any;
   commit: string;
@@ -69,15 +65,10 @@ export function BranchAndCommitPicker({
   titlePrefix: string;
   fallbackIndex: number;
   timeRange: any;
-  useClickHouse: boolean;
 }) {
-  const url = useClickHouse
-    ? `/api/clickhouse/${queryName}?parameters=${encodeURIComponent(
-        JSON.stringify(queryParams)
-      )}`
-    : `/api/query/${queryCollection}/${queryName}?parameters=${encodeURIComponent(
-        JSON.stringify(queryParams as RocksetParam[])
-      )}`;
+  const url = `/api/clickhouse/${queryName}?parameters=${encodeURIComponent(
+    JSON.stringify(queryParams)
+  )}`;
 
   let { data, error } = useSWR(url, fetcher, {
     refreshInterval: 60 * 60 * 1000, // refresh every hour
diff --git a/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx b/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx
index 763fee376b..f22bbd0c50 100644
--- a/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx
+++ b/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx
@@ -368,7 +368,6 @@ export default function Page() {
         />
         <BranchAndCommitPicker
           queryName={branchQueryName}
-          queryCollection={"inductor"}
           branch={rBranch}
           setBranch={setRBranch}
           commit={rCommit}
@@ -377,14 +376,12 @@ export default function Page() {
           titlePrefix={"Base"}
           fallbackIndex={-1} // Default to the next to latest in the window
           timeRange={timeRange}
-          useClickHouse={true}
         />
         <Divider orientation="vertical" flexItem>
           &mdash;Diff→
         </Divider>
         <BranchAndCommitPicker
           queryName={branchQueryName}
-          queryCollection={"inductor"}
           branch={lBranch}
           setBranch={setLBranch}
           commit={lCommit}
@@ -393,7 +390,6 @@ export default function Page() {
           titlePrefix={"New"}
           fallbackIndex={0} // Default to the latest commit
           timeRange={timeRange}
-          useClickHouse={true}
         />
       </Stack>
 
diff --git a/torchci/pages/benchmark/compilers.tsx b/torchci/pages/benchmark/compilers.tsx
index 4fc6e42940..2cb126d8b6 100644
--- a/torchci/pages/benchmark/compilers.tsx
+++ b/torchci/pages/benchmark/compilers.tsx
@@ -302,7 +302,6 @@ export default function Page() {
         />
         <BranchAndCommitPicker
           queryName={"compilers_benchmark_performance_branches"}
-          queryCollection={"inductor"}
           queryParams={queryParams}
           branch={rBranch}
           setBranch={setRBranch}
@@ -311,14 +310,12 @@ export default function Page() {
           titlePrefix={"Base"}
           fallbackIndex={-1} // Default to the next to latest in the window
           timeRange={timeRange}
-          useClickHouse={true}
         />
         <Divider orientation="vertical" flexItem>
           &mdash;Diff→
         </Divider>
         <BranchAndCommitPicker
           queryName={"compilers_benchmark_performance_branches"}
-          queryCollection={"inductor"}
           queryParams={queryParams}
           branch={lBranch}
           setBranch={setLBranch}
@@ -327,7 +324,6 @@ export default function Page() {
           titlePrefix={"New"}
           fallbackIndex={0} // Default to the latest commit
           timeRange={timeRange}
-          useClickHouse={true}
         />
       </Stack>
       <Report
diff --git a/torchci/pages/benchmark/llms.tsx b/torchci/pages/benchmark/llms.tsx
index 2898f9c2eb..1cb9f6f0fe 100644
--- a/torchci/pages/benchmark/llms.tsx
+++ b/torchci/pages/benchmark/llms.tsx
@@ -361,7 +361,6 @@ export default function Page() {
         />
         <BranchAndCommitPicker
           queryName={"oss_ci_benchmark_branches"}
-          queryCollection={"benchmarks"}
           queryParams={queryParams}
           branch={lBranch}
           setBranch={setLBranch}
@@ -370,14 +369,12 @@ export default function Page() {
           titlePrefix={"Base"}
           fallbackIndex={1} // Default to previous commit
           timeRange={timeRange}
-          useClickHouse={true}
         />
         <Divider orientation="vertical" flexItem>
           &mdash;Diff→
         </Divider>
         <BranchAndCommitPicker
           queryName={"oss_ci_benchmark_branches"}
-          queryCollection={"benchmarks"}
           queryParams={queryParams}
           branch={rBranch}
           setBranch={setRBranch}
@@ -386,7 +383,6 @@ export default function Page() {
           titlePrefix={"New"}
           fallbackIndex={0} // Default to the latest commit
           timeRange={timeRange}
-          useClickHouse={true}
         />
       </Stack>
       <Report
diff --git a/torchci/pages/benchmark/torchao.tsx b/torchci/pages/benchmark/torchao.tsx
index 3879a5915d..fc38f33ec0 100644
--- a/torchci/pages/benchmark/torchao.tsx
+++ b/torchci/pages/benchmark/torchao.tsx
@@ -302,7 +302,6 @@ export default function Page() {
         />
         <BranchAndCommitPicker
           queryName={"torchao_query_branches"}
-          queryCollection={"inductor"}
           queryParams={queryParams}
           branch={rBranch}
           setBranch={setRBranch}
@@ -311,14 +310,12 @@ export default function Page() {
           titlePrefix={"Base"}
           fallbackIndex={-1} // Default to the next to latest in the window
           timeRange={timeRange}
-          useClickHouse={true}
         />
         <Divider orientation="vertical" flexItem>
           &mdash;Diff→
         </Divider>
         <BranchAndCommitPicker
           queryName={"torchao_query_branches"}
-          queryCollection={"inductor"}
           queryParams={queryParams}
           branch={lBranch}
           setBranch={setLBranch}
@@ -327,7 +324,6 @@ export default function Page() {
           titlePrefix={"New"}
           fallbackIndex={0} // Default to the latest commit
           timeRange={timeRange}
-          useClickHouse={true}
         />
       </Stack>
       <Report