diff --git a/TODO.md b/TODO.md
index 564d26c..e33a0f2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,7 @@
 # TODO items
 
 ## General code cleanup
+-experiment with storing metadata via ItemIds on AST nodes (cf. https://rust-lang.github.io/rustc-guide/hir.html, https://github.com/rust-lang/rust/blob/master/src/librustc/hir/mod.rs )
 -implement and test open/use statements
 -implement field access
 - standardize on an error type that isn't String
diff --git a/schala-lang/language/src/ast.rs b/schala-lang/language/src/ast.rs
index af660d9..8fc50c2ee 100644
--- a/schala-lang/language/src/ast.rs
+++ b/schala-lang/language/src/ast.rs
@@ -10,16 +10,12 @@ pub use operators::*;
 #[derive(Clone, Debug, PartialEq)]
 pub struct Meta<T> {
   pub n: T,
-  source_map: SourceMap,
-  type_data: TypeData,
   pub fqsn: Option<FullyQualifiedSymbolName>
 }
 
 impl<T> Meta<T> {
   pub fn new(n: T) -> Meta<T> {
     Meta { n,
-    source_map: SourceMap::default(),
-    type_data: TypeData::new(),
     fqsn: None,
     }
   }