diff --git a/src/Buffer.ts b/src/Buffer.ts
index 42ab01b5..d98f1425 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -4,7 +4,7 @@
  */
 
 import { CircularList } from './common/CircularList';
-import { LineData, CharData, ITerminal, IBuffer } from './Types';
+import { CharData, ITerminal, IBuffer } from './Types';
 import { EventEmitter } from './EventEmitter';
 import { IMarker } from 'xterm';
 import { TerminalLine } from './TerminalLine';
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index 183571e8..0a066284 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -5,7 +5,7 @@
 
 import { assert } from 'chai';
 import { IMouseZoneManager, IMouseZone } from './ui/Types';
-import { ILinkMatcher, LineData, ITerminal } from './Types';
+import { ILinkMatcher, ITerminal } from './Types';
 import { Linkifier } from './Linkifier';
 import { MockBuffer, MockTerminal } from './utils/TestUtils.test';
 import { CircularList } from './common/CircularList';
diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index 8c8a20c5..a9d8423e 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -4,7 +4,7 @@
  */
 
 import { IMouseZoneManager } from './ui/Types';
-import { ILinkHoverEvent, ILinkMatcher, LinkMatcherHandler, LinkHoverEventTypes, ILinkMatcherOptions, ILinkifier, ITerminal, LineData } from './Types';
+import { ILinkHoverEvent, ILinkMatcher, LinkMatcherHandler, LinkHoverEventTypes, ILinkMatcherOptions, ILinkifier, ITerminal } from './Types';
 import { MouseZone } from './ui/MouseZoneManager';
 import { EventEmitter } from './EventEmitter';
 import { TerminalLine } from './TerminalLine';
diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
index 70e26fb4..bd9c8cbb 100644
--- a/src/SelectionManager.test.ts
+++ b/src/SelectionManager.test.ts
@@ -8,7 +8,7 @@ import { CharMeasure } from './ui/CharMeasure';
 import { SelectionManager, SelectionMode } from './SelectionManager';
 import { SelectionModel } from './SelectionModel';
 import { BufferSet } from './BufferSet';
-import { LineData, CharData, ITerminal, IBuffer } from './Types';
+import { ITerminal, IBuffer } from './Types';
 import { MockTerminal } from './utils/TestUtils.test';
 import { TerminalLine } from './TerminalLine';
 
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 5e3f8f50..5a6528c1 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -21,7 +21,7 @@
  *   http://linux.die.net/man/7/urxvt
  */
 
-import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharData, LineData, CharacterJoinerHandler } from './Types';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharData, CharacterJoinerHandler } from './Types';
 import { IMouseZoneManager } from './ui/Types';
 import { IRenderer } from './renderer/Types';
 import { BufferSet } from './BufferSet';
diff --git a/src/TerminalLine.ts b/src/TerminalLine.ts
index fcaa99df..6e87a212 100644
--- a/src/TerminalLine.ts
+++ b/src/TerminalLine.ts
@@ -16,7 +16,7 @@ export class TerminalLine {
     // throw Error when something tries to do number index access
     // TODO: remove when done with transition
     for (let i = 0; i < 100; ++i) {
-      Object.defineProperty(this, i, {
+      Object.defineProperty(this, i.toString(), {
         get: () => {
           throw new Error('get per index access is disabled');
         },
diff --git a/src/handlers/AltClickHandler.ts b/src/handlers/AltClickHandler.ts
index 48556ac5..fcafcddb 100644
--- a/src/handlers/AltClickHandler.ts
+++ b/src/handlers/AltClickHandler.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ITerminal, ICircularList, LineData } from '../Types';
+import { ITerminal, ICircularList } from '../Types';
 import { C0 } from '../common/data/EscapeSequences';
 import { TerminalLine } from '../TerminalLine';
 
diff --git a/src/renderer/CharacterJoinerRegistry.ts b/src/renderer/CharacterJoinerRegistry.ts
index b8d1a3cd..2b50f5ac 100644
--- a/src/renderer/CharacterJoinerRegistry.ts
+++ b/src/renderer/CharacterJoinerRegistry.ts
@@ -1,5 +1,5 @@
 import { CHAR_DATA_ATTR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';
-import { ITerminal, LineData } from '../Types';
+import { ITerminal } from '../Types';
 import { ICharacterJoinerRegistry, ICharacterJoiner } from './Types';
 import { TerminalLine } from '../TerminalLine';
 
diff --git a/src/renderer/dom/DomRendererRowFactory.test.ts b/src/renderer/dom/DomRendererRowFactory.test.ts
index 32284615..9503a46c 100644
--- a/src/renderer/dom/DomRendererRowFactory.test.ts
+++ b/src/renderer/dom/DomRendererRowFactory.test.ts
@@ -6,7 +6,6 @@
 import jsdom = require('jsdom');
 import { assert } from 'chai';
 import { DomRendererRowFactory } from './DomRendererRowFactory';
-import { LineData } from '../../Types';
 import { DEFAULT_ATTR, NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from '../../Buffer';
 import { FLAGS } from '../Types';
 import { TerminalLine } from '../../TerminalLine';
diff --git a/src/renderer/dom/DomRendererRowFactory.ts b/src/renderer/dom/DomRendererRowFactory.ts
index d2a43b06..1c259549 100644
--- a/src/renderer/dom/DomRendererRowFactory.ts
+++ b/src/renderer/dom/DomRendererRowFactory.ts
@@ -3,7 +3,6 @@
  * @license MIT
  */
 
-import { LineData } from '../../Types';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, CHAR_DATA_WIDTH_INDEX } from '../../Buffer';
 import { FLAGS } from '../Types';
 import { TerminalLine } from '../../TerminalLine';
diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts
index 81754397..0d14d471 100644
--- a/src/utils/TestUtils.test.ts
+++ b/src/utils/TestUtils.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { IColorSet, IRenderer, IRenderDimensions, IColorManager } from '../renderer/Types';
-import { LineData, IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, ICircularList, ILinkifier, IMouseHelper, ILinkMatcherOptions, XtermListener, CharacterJoinerHandler } from '../Types';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, ICircularList, ILinkifier, IMouseHelper, ILinkMatcherOptions, XtermListener, CharacterJoinerHandler } from '../Types';
 import { Buffer, NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from '../Buffer';
 import * as Browser from '../shared/utils/Browser';
 import { ITheme, IDisposable, IMarker } from 'xterm';