diff --git a/compass/components/Table/RowOpenAction.tsx b/compass/components/Table/RowOpenAction.tsx
index 0279b22..3678630 100644
--- a/compass/components/Table/RowOpenAction.tsx
+++ b/compass/components/Table/RowOpenAction.tsx
@@ -19,7 +19,6 @@ export function RowOpenAction<T extends DataPoint>({ title, rowData, setData }:
         <div className="font-semibold group flex flex-row items-center justify-between pr-2">
             {title}
             <span>
-                {/* Added OnRowUpdate to drawer */}
                 <Drawer
                     title="My Drawer Title"
                     editableContent={pageContent}
diff --git a/compass/components/Table/Table.tsx b/compass/components/Table/Table.tsx
index 61b9847..97b6251 100644
--- a/compass/components/Table/Table.tsx
+++ b/compass/components/Table/Table.tsx
@@ -17,8 +17,8 @@ import {
 import { TableAction } from "./TableAction";
 import { PlusIcon } from "@heroicons/react/24/solid";
 import { rankItem } from "@tanstack/match-sorter-utils";
-import DataPoint from "@/utils/models/DataPoint";
 import { RowOptionMenu } from "./RowOptionMenu";
+import DataPoint from "@/utils/models/DataPoint";
 
 type TableProps<T extends DataPoint> = {
     data: T[],
diff --git a/compass/utils/models/Resource.ts b/compass/utils/models/Resource.ts
index 84951ee..c6c029c 100644
--- a/compass/utils/models/Resource.ts
+++ b/compass/utils/models/Resource.ts
@@ -1,7 +1,6 @@
 import { Program } from "./User";
-import DataPoint from "./DataPoint";
 
-export default interface Resource extends DataPoint {
+export default interface Resource {
     id: number;
     created_at: Date;
     name: string;
diff --git a/compass/utils/models/Service.ts b/compass/utils/models/Service.ts
index 600f734..5093c5f 100644
--- a/compass/utils/models/Service.ts
+++ b/compass/utils/models/Service.ts
@@ -1,7 +1,6 @@
 import { Program } from "./User";
-import DataPoint from "./DataPoint";
 
-export default interface Service extends DataPoint {
+export default interface Service {
     id: number;
     created_at: Date;
     name: string;
diff --git a/compass/utils/models/User.ts b/compass/utils/models/User.ts
index 2f0abd3..0c55114 100644
--- a/compass/utils/models/User.ts
+++ b/compass/utils/models/User.ts
@@ -1,5 +1,3 @@
-import DataPoint from "./DataPoint";
-
 export enum Program {
     ECONOMIC = "ECONOMIC",
     DOMESTIC = "DOMESTIC",
@@ -12,7 +10,7 @@ export enum Role {
     VOLUNTEER = "VOLUNTEER",
 }
 
-export default interface User extends DataPoint {
+export default interface User {
     id: number;
     uuid: string;
     username: string;