diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index fad43b8dd86..7c16531f8c3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8738,20 +8738,6 @@ module ts {
 
         // Language service support
 
-        function getNodeAtPosition(sourceFile: SourceFile, position: number): Node {
-            function findChildAtPosition(parent: Node): Node {
-                var child = forEachChild(parent, node => {
-                    if (position >= node.pos && position <= node.end && position >= getTokenPosOfNode(node)) {
-                        return findChildAtPosition(node);
-                    }
-                });
-                return child || parent;
-            }
-            if (position < sourceFile.pos) position = sourceFile.pos;
-            if (position > sourceFile.end) position = sourceFile.end;
-            return findChildAtPosition(sourceFile);
-        }
-
         function isInsideWithStatementBody(node: Node): boolean {
             if (node) {
                 while (node.parent) {
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index c44649a6ee1..c0d3ddedce3 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -27,7 +27,6 @@ var _chai: typeof chai = require('chai');
 var assert: typeof _chai.assert = _chai.assert;
 declare var __dirname: any; // Node-specific
 var global = <any>Function("return this").call(null);
-var typescript = require('./typescriptServices');
 
 module Utils {
     var global = <any>Function("return this").call(null);
@@ -1390,4 +1389,7 @@ module Harness {
     }
 
     if (Error) (<any>Error).stackTraceLimit = 1;
-}
\ No newline at end of file
+}
+
+// TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval
+eval(Harness.tcServicesFile);
diff --git a/src/services/services.ts b/src/services/services.ts
index 2ec69e8c661..01e03a76232 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -5379,19 +5379,6 @@ module ts {
                 return new RegExp(regExpString, "gim");
             }
 
-            function getContainingComment(comments: CommentRange[], position: number): CommentRange {
-                if (comments) {
-                    for (var i = 0, n = comments.length; i < n; i++) {
-                        var comment = comments[i];
-                        if (comment.pos <= position && position < comment.end) {
-                            return comment;
-                        }
-                    }
-                }
-
-                return undefined;
-            }
-
             function isLetterOrDigit(char: number): boolean {
                 return (char >= CharacterCodes.a && char <= CharacterCodes.z) ||
                     (char >= CharacterCodes.A && char <= CharacterCodes.Z) ||
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 9df0476c105..32551d9737b 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -104,21 +104,6 @@ module ts {
         return syntaxList;
     }
 
-    /**
-     * Includes the start position of each child, but excludes the end.
-     */
-    export function findListItemIndexContainingPosition(list: Node, position: number): number {
-        Debug.assert(list.kind === SyntaxKind.SyntaxList);
-        var children = list.getChildren();
-        for (var i = 0; i < children.length; i++) {
-            if (children[i].pos <= position && children[i].end > position) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
     /* Gets the token whose text has range [start, end) and 
      * position >= start and (position < end or (position === end && token is keyword or identifier))
      */
diff --git a/tests/baselines/reference/typeParameterInConstraint1.errors.txt b/tests/baselines/reference/typeParameterInConstraint1.errors.txt
new file mode 100644
index 00000000000..ee8e9dcf37f
--- /dev/null
+++ b/tests/baselines/reference/typeParameterInConstraint1.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/typeParameterInConstraint1.ts(1,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
+
+
+==== tests/cases/compiler/typeParameterInConstraint1.ts (1 errors) ====
+    class C<T, U extends T> {
+               ~~~~~~~~~~~
+!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterInConstraint1.js b/tests/baselines/reference/typeParameterInConstraint1.js
new file mode 100644
index 00000000000..1cce707112d
--- /dev/null
+++ b/tests/baselines/reference/typeParameterInConstraint1.js
@@ -0,0 +1,10 @@
+//// [typeParameterInConstraint1.ts]
+class C<T, U extends T> {
+}
+
+//// [typeParameterInConstraint1.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
diff --git a/tests/cases/compiler/typeParameterInConstraint1.ts b/tests/cases/compiler/typeParameterInConstraint1.ts
new file mode 100644
index 00000000000..49c2ab18aee
--- /dev/null
+++ b/tests/cases/compiler/typeParameterInConstraint1.ts
@@ -0,0 +1,2 @@
+class C<T, U extends T> {
+}
\ No newline at end of file