diff --git a/src/App.tsx b/src/App.tsx
index 1977e34..b0dc359 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -27,8 +27,8 @@ export default class App extends Component<{
     {
         super(props);
 
-        // TODO: get rid of the casting
-        const ourTree = makeTree({__typename: "Text", content: "korzen", is_done: false} as Text);
+        const initial_resource: Resource = {__typename: "Text", content: "korzen", is_done: false};
+        const ourTree = makeTree(initial_resource);
 
         this.state= {
             chosenNode: ourTree.root.id,
@@ -206,11 +206,10 @@ function displayTree(t: Tree<Resource>, chosenNode: NodeID): ReactTreeGraphNode
 }
 
 
-// TODO: get rid of the casting
 function displayResource(r: Resource): string
 {
     return {
-        "Link": (r as unknown as Link).address,
+        "Link": (r as Link).address,
         "Text": (r as Text).content,
     }[r.__typename];
 }
diff --git a/src/ResourceAdder.tsx b/src/ResourceAdder.tsx
index c5197c6..a1b0492 100644
--- a/src/ResourceAdder.tsx
+++ b/src/ResourceAdder.tsx
@@ -1,5 +1,4 @@
-// TODO: how to limit importing scope?
-import { Resource, ResourceTypeString, ResourceTypeStringValues, Link, Text } from "./core/resources";
+import { Resource, ResourceTypeString, ResourceTypeStringValues } from "./core/resources";
 
 import React, { FunctionComponent } from "react";
 import { Formik, Form, Field } from "formik";
@@ -40,11 +39,10 @@ const ResourceAdder: React.FunctionComponent<{
 export default ResourceAdder;
 
 
-// TODO: get rid of the casting
 function default_for_typestring(t: ResourceTypeString): Resource
 {
     return {
-        "Link": { __typename: "Link", address: "", is_done: false } as Link,
-        "Text": { __typename: "Text", content: "", is_done: false } as Text,
+        "Link": { __typename: "Link", address: "", is_done: false } as Resource,
+        "Text": { __typename: "Text", content: "", is_done: false } as Resource,
     }[t];
 }
diff --git a/src/ResourceEditor.tsx b/src/ResourceEditor.tsx
index ade5347..de16773 100644
--- a/src/ResourceEditor.tsx
+++ b/src/ResourceEditor.tsx
@@ -27,7 +27,7 @@ const ResourceEditor: React.FunctionComponent<{
                 __typename: props.resource.__typename,
             };
 
-            props.onEditonCommit(resource as any);
+            props.onEditonCommit(resource as Resource);
         }}
     >
         {