diff --git a/src/components/sidebar/screenList.tsx b/src/components/sidebar/screenList.tsx
index 5761d7e..be97afa 100644
--- a/src/components/sidebar/screenList.tsx
+++ b/src/components/sidebar/screenList.tsx
@@ -9,14 +9,14 @@
 import { FiEdit3, FiMoreHorizontal, FiTrash2, FiX } from "react-icons/fi"
 
 interface ScreenListPorps {
-    screenData: ScreenState,
+    screenState: ScreenState,
     screenActions: ScreenActions,
     componentActions: ComponentActions,
     tableState: TablesState
     selectComponent: (index: number) => void
 }
 
-export function ScreenList({ screenData, screenActions, componentActions, tableState, selectComponent }: ScreenListPorps) {
+export function ScreenList({ screenState, screenActions, componentActions, tableState, selectComponent }: ScreenListPorps) {
 
     const [showAddModal, setShowAddModel] = useState(false);
     const [editIndex, setEditIndex] = useState(-1);
@@ -48,16 +48,16 @@
             </div>
 
             <div className="space-y-2">
-                {screenData.screens.map((screen, index) => (
+                {screenState.screens.map((screen, index) => (
                     <ScreenCard
                         key={index}
                         screen={screen}
                         index={index}
-                        selected={index === screenData.curScreenIndex}
+                        selected={index === screenState.curScreenIndex}
                         setCurScreenIndex={screenActions.setCurScreenIndex}
                         activeDropdown={activeDropdown}
                         setActiveDropdown={setActiveDropdown}
-                        isLast={screenData.screens.length === 1}
+                        isLast={screenState.screens.length === 1}
                         closeDropdown={closeDropdown}
                         deleteScreen={screenActions.deleteScreen}
                         startEdit={startEdit}
@@ -100,7 +100,7 @@
             {showTemplateModal && <AddTemplateModal
                 componenetActions={componentActions}
                 tableState={tableState}
-                screenData={screenData}
+                screenState={screenState}
                 screenActions={screenActions}
                 close={() => setShowTemplateModal(false)}
             />}
@@ -276,12 +276,12 @@
 interface AddTemplateModalProps {
     close: () => void,
     tableState: TablesState,
-    screenData: ScreenState
+    screenState: ScreenState
     screenActions: ScreenActions
     componenetActions: ComponentActions
 }
 
-function AddTemplateModal({ close, tableState, screenData, screenActions, componenetActions }: AddTemplateModalProps) {
+function AddTemplateModal({ close, tableState, screenState, screenActions, componenetActions }: AddTemplateModalProps) {
 
     const [type, setType] = useState<"add" | "list" | "delete" | "update" | "search" | "">("");
     const [screenName, setScreenName] = useState("");
@@ -350,7 +350,7 @@
                     componenetActions={componenetActions}
                     screenName={screenName}
                     screenActions={screenActions}
-                    screenData={screenData}
+                    screenState={screenState}
                     close={close}
                 />}
             </div>
@@ -361,13 +361,13 @@
 interface AddTemplateProps {
     tableState: TablesState,
     componenetActions: ComponentActions,
-    screenData: ScreenState,
+    screenState: ScreenState,
     screenActions: ScreenActions
     screenName: string
     close: () => void
 }
 
-function AddTemplate({ tableState, componenetActions, screenName, screenActions, screenData, close }: AddTemplateProps) {
+function AddTemplate({ tableState, componenetActions, screenName, screenActions, screenState, close }: AddTemplateProps) {
 
     const tables = useMemo(() => tableState.tables, [tableState.tables])
     const [selectedTableId, setSelectedTableId] = useState("");
@@ -515,7 +515,7 @@
                 >
                     <option value={""}>選択してください...</option>
                     <option value="_back">戻る</option>
-                    {screenData.screens.map((screen, idx) => (
+                    {screenState.screens.map((screen, idx) => (
                         <option key={idx} value={screen.name}>
                             {screen.name}
                         </option>
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 34701c0..2a835e1 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -13,7 +13,7 @@
 
 interface SidebarProps {
     activeTabId: string
-    screenData: ScreenState
+    screenState: ScreenState
     screenActions: ScreenActions
     componentState: ComponentState
     componentActions: ComponentActions
@@ -23,7 +23,7 @@
 
 export function Sidebar({
     activeTabId,
-    screenData,
+    screenState,
     screenActions,
     componentState,
     componentActions,
@@ -39,7 +39,7 @@
             <div className="w-full">
                 {activeTabId === "screens" &&
                     <ScreenList
-                        screenData={screenData}
+                        screenState={screenState}
                         screenActions={screenActions}
                         componentActions={componentActions}
                         tableState={tableState}
diff --git a/src/components/workspace.tsx b/src/components/workspace.tsx
index 08657a3..55bf51d 100644
--- a/src/components/workspace.tsx
+++ b/src/components/workspace.tsx
@@ -28,7 +28,7 @@
             <div className="flex flex-1">
                 <Sidebar
                     activeTabId={activeTabId}
-                    screenData={screenStateAndActions.screenState}
+                    screenState={screenStateAndActions.screenState}
                     screenActions={screenStateAndActions.screenActions}
                     componentState={componentStateAndActions.componentState}
                     componentActions={componentStateAndActions.componentActions}
diff --git a/src/types/component.ts b/src/types/component.ts
index 66d49cc..3af6cc7 100644
--- a/src/types/component.ts
+++ b/src/types/component.ts
@@ -96,53 +96,3 @@
     generalData: TableGeneralData,
     style: { [k: string]: string },
 }
-
-export function fromComponentData(componentData: ComponentData): Component {
-    switch (componentData.type) {
-        case ComponentType.Button:
-            return {
-                id: componentData._id,
-                screenId: componentData.screenId,
-                name: componentData.name,
-                type: componentData.type,
-                uiData: componentData.uiData,
-                index: componentData.index,
-                generalData: componentData.generalData as ButtonGeneralData,
-                style: componentData.style,
-                action: componentData.action ? componentData.action : undefined
-            }
-        case ComponentType.Text:
-            return {
-                id: componentData._id,
-                screenId: componentData.screenId,
-                name: componentData.name,
-                type: componentData.type,
-                uiData: componentData.uiData,
-                index: componentData.index,
-                generalData: componentData.generalData as TextGeneralData,
-                style: componentData.style,
-            }
-        case ComponentType.TextField:
-            return {
-                id: componentData._id,
-                screenId: componentData.screenId,
-                name: componentData.name,
-                type: componentData.type,
-                uiData: componentData.uiData,
-                index: componentData.index,
-                generalData: componentData.generalData as TextFieldGeneralData,
-                style: componentData.style,
-            }
-        case ComponentType.Table:
-            return {
-                id: componentData._id,
-                screenId: componentData.screenId,
-                name: componentData.name,
-                type: componentData.type,
-                uiData: componentData.uiData,
-                index: componentData.index,
-                generalData: componentData.generalData as TableGeneralData,
-                style: componentData.style,
-            }
-    }
-}
\ No newline at end of file
diff --git a/src/types/screen.ts b/src/types/screen.ts
index 679c654..9789230 100644
--- a/src/types/screen.ts
+++ b/src/types/screen.ts
@@ -13,14 +13,4 @@
     projectId: string,
     index: number
     components: Component[]
-}
-
-export function fromScreenData(screenData: ScreenData): Screen {
-    return {
-        id: screenData._id,
-        name: screenData.name,
-        projectId: screenData.projectId,
-        index: screenData.index,
-        components: []
-    }
 }
\ No newline at end of file
diff --git a/src/types/table.ts b/src/types/table.ts
index e20cba5..ff1e58d 100644
--- a/src/types/table.ts
+++ b/src/types/table.ts
@@ -26,14 +26,6 @@
     columns: Column[]
 }
 
-export function fromTableData(tableData: TableData): Table {
-    return {
-        id: tableData._id,
-        name: tableData.name,
-        columns: tableData.columns
-    }
-}
-
 export interface Column {
     name: string, //unique
     isPrimary: boolean,