diff --git a/src/mol-math/geometry.ts b/src/mol-math/geometry.ts
index f8134ddd0601834b1b8cbde0f79ef120664b041f..5754f04a380143ee983caaed3bea1b3d1028cc28 100644
--- a/src/mol-math/geometry.ts
+++ b/src/mol-math/geometry.ts
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-math/geometry/_spec/lookup3d.spec.ts b/src/mol-math/geometry/_spec/lookup3d.spec.ts
index af2c30a463e8016d0efebf011cb47baffe8f8242..92760e92d874ac742f0cf8bc6f044f24f0916c06 100644
--- a/src/mol-math/geometry/_spec/lookup3d.spec.ts
+++ b/src/mol-math/geometry/_spec/lookup3d.spec.ts
@@ -1,8 +1,8 @@
-/*
-* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
-*
-* @author David Sehnal <david.sehnal@gmail.com>
-*/
+/**
+ * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
import { GridLookup3D } from '../../geometry';
import { sortArray } from 'mol-data/util';
diff --git a/src/mol-math/geometry/common.ts b/src/mol-math/geometry/common.ts
index 195224635b1ef41049e0fafe83d8aa359186edd3..e203afdf228197b4b18a08bfd33ea0b50b4a455c 100644
--- a/src/mol-math/geometry/common.ts
+++ b/src/mol-math/geometry/common.ts
@@ -1,8 +1,8 @@
-/*
-* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
-*
-* @author David Sehnal <david.sehnal@gmail.com>
-*/
+/**
+ * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
import { OrderedSet } from 'mol-data/int'
diff --git a/src/mol-math/geometry/lookup3d/common.ts b/src/mol-math/geometry/lookup3d/common.ts
index 0aa58601dcc7f61d3fdfc5eb13520f1037846177..874735b9ca2659be52324834350cc595f5bc5024 100644
--- a/src/mol-math/geometry/lookup3d/common.ts
+++ b/src/mol-math/geometry/lookup3d/common.ts
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-math/geometry/lookup3d/grid.ts b/src/mol-math/geometry/lookup3d/grid.ts
index 6d168df2c935433c0330cf4bd26ba3e111892290..7abb47781969df8deb176c5e1f9918f3cf2b532d 100644
--- a/src/mol-math/geometry/lookup3d/grid.ts
+++ b/src/mol-math/geometry/lookup3d/grid.ts
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-math/geometry/primitives/box3d.ts b/src/mol-math/geometry/primitives/box3d.ts
index 21a5795165779a10f5223e2b2ccf928d31018ad7..90b6b241c113c05083456013b2ed3d7b6eb5fbcc 100644
--- a/src/mol-math/geometry/primitives/box3d.ts
+++ b/src/mol-math/geometry/primitives/box3d.ts
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-math/geometry/primitives/sphere3d.ts b/src/mol-math/geometry/primitives/sphere3d.ts
index bd74a09a2a1fd500a5b1708265be56b7fec88423..3e280da055a57333215ebda7b540d309b50280b1 100644
--- a/src/mol-math/geometry/primitives/sphere3d.ts
+++ b/src/mol-math/geometry/primitives/sphere3d.ts
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-model/annotation/annotation.ts b/src/mol-model/annotation/annotation.ts
deleted file mode 100644
index 338c2de1cf988439cd7cc1b020b70b9215edb865..0000000000000000000000000000000000000000
--- a/src/mol-model/annotation/annotation.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import { Structure, ElementSet, Element } from '../structure'
-
-interface Annotation<E = any> {
- definition: Annotation.Definition<E>,
- getValue(l: Element.Location): E | undefined,
- getAll(l: ElementSet): { annotations: E[], /* TODO: map annotations to elements */ }
-}
-
-namespace Annotation {
- export const enum Kind {
- Atom,
- Residue,
- Sequence,
- Chain,
- Entity,
- Coarse,
- Spatial
- }
-
- export const enum Type {
- Num,
- Str,
- Obj
- }
-
- export interface Definition<E = any> {
- name: string,
- kind: Kind,
- type: Type,
- prepare<Data>(s: Structure, data: Data): Annotation<E>,
- }
-}
-
-export { Annotation }
\ No newline at end of file
diff --git a/src/mol-model/annotations.ts b/src/mol-model/annotations.ts
deleted file mode 100644
index 828e2329303a8e7635cbc1f602d651a49af7d20f..0000000000000000000000000000000000000000
--- a/src/mol-model/annotations.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import { Annotation } from './annotation/annotation'
-import { UUID } from 'mol-util'
-
-interface Annotations {
- id: UUID,
- all: Annotation[],
- byKind: { [kind: number]: Annotation }
- //getAll()
-}
-
-export { Annotations }
\ No newline at end of file
diff --git a/src/mol-model/structure/model/model.ts b/src/mol-model/structure/model/model.ts
index 948988c30fa0f3813adc88bebf241b60114d9ec3..e7f0fe0a8b85b9bf3b0b32f869bdf970ccb87f55 100644
--- a/src/mol-model/structure/model/model.ts
+++ b/src/mol-model/structure/model/model.ts
@@ -14,8 +14,6 @@ import CoarseGrained from './properties/coarse-grained'
import from_gro from './formats/gro'
import from_mmCIF from './formats/mmcif'
-import { Annotations } from '../../annotations'
-
/**
* Interface to the "source data" of the molecule.
*
@@ -32,7 +30,6 @@ interface Model extends Readonly<{
conformation: Conformation,
symmetry: Symmetry,
coarseGrained: CoarseGrained,
- annotations: Annotations,
atomCount: number,
}> {