From cff2aeaeb77067a1657180a45fb7763863514e6b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 9 Apr 2014 18:36:26 +0400
Subject: [PATCH] cleanup

---
 lib/ace/mode/abap.js         | 1 -
 lib/ace/mode/actionscript.js | 1 -
 lib/ace/mode/ada.js          | 1 -
 lib/ace/mode/apache_conf.js  | 1 -
 lib/ace/mode/asciidoc.js     | 1 -
 lib/ace/mode/assembly_x86.js | 1 -
 lib/ace/mode/autohotkey.js   | 1 -
 lib/ace/mode/batchfile.js    | 1 -
 lib/ace/mode/c9search.js     | 1 -
 lib/ace/mode/c_cpp.js        | 1 -
 lib/ace/mode/cirru.js        | 1 -
 lib/ace/mode/clojure.js      | 1 -
 lib/ace/mode/cobol.js        | 1 -
 lib/ace/mode/coffee.js       | 1 -
 lib/ace/mode/coldfusion.js   | 1 -
 lib/ace/mode/csharp.js       | 1 -
 lib/ace/mode/css.js          | 1 -
 lib/ace/mode/curly.js        | 1 -
 lib/ace/mode/d.js            | 1 -
 lib/ace/mode/dart.js         | 1 -
 lib/ace/mode/diff.js         | 1 -
 lib/ace/mode/django.js       | 1 -
 lib/ace/mode/dot.js          | 1 -
 lib/ace/mode/ejs.js          | 1 -
 lib/ace/mode/erlang.js       | 1 -
 lib/ace/mode/forth.js        | 1 -
 lib/ace/mode/ftl.js          | 1 -
 lib/ace/mode/gherkin.js      | 1 -
 lib/ace/mode/glsl.js         | 1 -
 lib/ace/mode/golang.js       | 1 -
 lib/ace/mode/groovy.js       | 1 -
 lib/ace/mode/haml.js         | 1 -
 lib/ace/mode/handlebars.js   | 1 -
 lib/ace/mode/haskell.js      | 1 -
 lib/ace/mode/haxe.js         | 1 -
 lib/ace/mode/html.js         | 1 -
 lib/ace/mode/html_ruby.js    | 1 -
 lib/ace/mode/ini.js          | 1 -
 lib/ace/mode/jack.js         | 1 -
 lib/ace/mode/jade.js         | 1 -
 lib/ace/mode/java.js         | 1 -
 lib/ace/mode/javascript.js   | 1 -
 lib/ace/mode/json.js         | 1 -
 lib/ace/mode/jsp.js          | 1 -
 lib/ace/mode/jsx.js          | 1 -
 lib/ace/mode/julia.js        | 1 -
 lib/ace/mode/latex.js        | 1 -
 lib/ace/mode/less.js         | 1 -
 lib/ace/mode/liquid.js       | 1 -
 lib/ace/mode/lisp.js         | 1 -
 lib/ace/mode/logiql.js       | 1 -
 lib/ace/mode/logiql_test.js  | 1 -
 lib/ace/mode/lsl.js          | 1 -
 lib/ace/mode/lua.js          | 1 -
 lib/ace/mode/luapage.js      | 1 -
 lib/ace/mode/lucene.js       | 3 +--
 lib/ace/mode/makefile.js     | 1 -
 lib/ace/mode/markdown.js     | 1 -
 lib/ace/mode/matlab.js       | 1 -
 lib/ace/mode/mel.js          | 1 -
 lib/ace/mode/mushcode.js     | 1 -
 lib/ace/mode/mysql.js        | 1 -
 lib/ace/mode/nix.js          | 1 -
 lib/ace/mode/objectivec.js   | 1 -
 lib/ace/mode/ocaml.js        | 1 -
 lib/ace/mode/pascal.js       | 1 -
 lib/ace/mode/perl.js         | 1 -
 lib/ace/mode/pgsql.js        | 1 -
 lib/ace/mode/php.js          | 1 -
 lib/ace/mode/plain_text.js   | 1 -
 lib/ace/mode/powershell.js   | 1 -
 lib/ace/mode/prolog.js       | 1 -
 lib/ace/mode/properties.js   | 1 -
 lib/ace/mode/protobuf.js     | 6 +-----
 lib/ace/mode/python.js       | 1 -
 lib/ace/mode/r.js            | 1 -
 lib/ace/mode/rdoc.js         | 1 -
 lib/ace/mode/rhtml.js        | 1 -
 lib/ace/mode/ruby.js         | 1 -
 lib/ace/mode/ruby_test.js    | 1 -
 lib/ace/mode/rust.js         | 1 -
 lib/ace/mode/sass.js         | 1 -
 lib/ace/mode/scad.js         | 1 -
 lib/ace/mode/scala.js        | 1 -
 lib/ace/mode/scheme.js       | 1 -
 lib/ace/mode/scss.js         | 1 -
 lib/ace/mode/sh.js           | 1 -
 lib/ace/mode/sjs.js          | 6 +-----
 lib/ace/mode/smarty.js       | 1 -
 lib/ace/mode/snippets.js     | 1 -
 lib/ace/mode/soy_template.js | 1 -
 lib/ace/mode/space.js        | 5 ++---
 lib/ace/mode/sql.js          | 1 -
 lib/ace/mode/stylus.js       | 1 -
 lib/ace/mode/svg.js          | 1 -
 lib/ace/mode/tcl.js          | 1 -
 lib/ace/mode/tex.js          | 1 -
 lib/ace/mode/textile.js      | 1 -
 lib/ace/mode/toml.js         | 1 -
 lib/ace/mode/typescript.js   | 1 -
 lib/ace/mode/vbscript.js     | 1 -
 lib/ace/mode/velocity.js     | 1 -
 lib/ace/mode/verilog.js      | 1 -
 lib/ace/mode/vhdl.js         | 1 -
 lib/ace/mode/xml.js          | 1 -
 lib/ace/mode/yaml.js         | 1 -
 106 files changed, 5 insertions(+), 117 deletions(-)

diff --git a/lib/ace/mode/abap.js b/lib/ace/mode/abap.js
index 020837a2..c9d5a991 100644
--- a/lib/ace/mode/abap.js
+++ b/lib/ace/mode/abap.js
@@ -31,7 +31,6 @@
 define(function(require, exports, module) {
 "use strict";
 
-var Tokenizer = require("../tokenizer").Tokenizer;
 var Rules = require("./abap_highlight_rules").AbapHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/actionscript.js b/lib/ace/mode/actionscript.js
index 081fa284..93297e42 100644
--- a/lib/ace/mode/actionscript.js
+++ b/lib/ace/mode/actionscript.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ActionScriptHighlightRules = require("./actionscript_highlight_rules").ActionScriptHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/ada.js b/lib/ace/mode/ada.js
index a50d5f61..dc1dfa14 100644
--- a/lib/ace/mode/ada.js
+++ b/lib/ace/mode/ada.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var AdaHighlightRules = require("./ada_highlight_rules").AdaHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/apache_conf.js b/lib/ace/mode/apache_conf.js
index 29437ef0..2379b44b 100644
--- a/lib/ace/mode/apache_conf.js
+++ b/lib/ace/mode/apache_conf.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ApacheConfHighlightRules = require("./apache_conf_highlight_rules").ApacheConfHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/asciidoc.js b/lib/ace/mode/asciidoc.js
index 45027c8b..894d9763 100644
--- a/lib/ace/mode/asciidoc.js
+++ b/lib/ace/mode/asciidoc.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var AsciidocHighlightRules = require("./asciidoc_highlight_rules").AsciidocHighlightRules;
 var AsciidocFoldMode = require("./folding/asciidoc").FoldMode;
 
diff --git a/lib/ace/mode/assembly_x86.js b/lib/ace/mode/assembly_x86.js
index e6055183..d6343e80 100644
--- a/lib/ace/mode/assembly_x86.js
+++ b/lib/ace/mode/assembly_x86.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var AssemblyX86HighlightRules = require("./assembly_x86_highlight_rules").AssemblyX86HighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/autohotkey.js b/lib/ace/mode/autohotkey.js
index 4402469e..21d3c802 100644
--- a/lib/ace/mode/autohotkey.js
+++ b/lib/ace/mode/autohotkey.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var AutoHotKeyHighlightRules = require("./autohotkey_highlight_rules").AutoHotKeyHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/batchfile.js b/lib/ace/mode/batchfile.js
index 72d157e8..e080464c 100644
--- a/lib/ace/mode/batchfile.js
+++ b/lib/ace/mode/batchfile.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var BatchFileHighlightRules = require("./batchfile_highlight_rules").BatchFileHighlightRules;
 var FoldMode = require("./folding/cstyle").FoldMode;
 
diff --git a/lib/ace/mode/c9search.js b/lib/ace/mode/c9search.js
index 10c3ade2..3286456a 100644
--- a/lib/ace/mode/c9search.js
+++ b/lib/ace/mode/c9search.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var C9SearchHighlightRules = require("./c9search_highlight_rules").C9SearchHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var C9StyleFoldMode = require("./folding/c9search").FoldMode;
diff --git a/lib/ace/mode/c_cpp.js b/lib/ace/mode/c_cpp.js
index faf4731d..a2dc133f 100644
--- a/lib/ace/mode/c_cpp.js
+++ b/lib/ace/mode/c_cpp.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/cirru.js b/lib/ace/mode/cirru.js
index fa83bbf0..5f1c4d9e 100644
--- a/lib/ace/mode/cirru.js
+++ b/lib/ace/mode/cirru.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var CirruHighlightRules = require("./cirru_highlight_rules").CirruHighlightRules;
 var CoffeeFoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/clojure.js b/lib/ace/mode/clojure.js
index 4fadb5ec..4cb86110 100644
--- a/lib/ace/mode/clojure.js
+++ b/lib/ace/mode/clojure.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ClojureHighlightRules = require("./clojure_highlight_rules").ClojureHighlightRules;
 var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/cobol.js b/lib/ace/mode/cobol.js
index 1502993a..91713bd0 100644
--- a/lib/ace/mode/cobol.js
+++ b/lib/ace/mode/cobol.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var CobolHighlightRules = require("./cobol_highlight_rules").CobolHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js
index de331204..98e862b8 100644
--- a/lib/ace/mode/coffee.js
+++ b/lib/ace/mode/coffee.js
@@ -31,7 +31,6 @@
 define(function(require, exports, module) {
 "use strict";
 
-var Tokenizer = require("../tokenizer").Tokenizer;
 var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
 var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var FoldMode = require("./folding/coffee").FoldMode;
diff --git a/lib/ace/mode/coldfusion.js b/lib/ace/mode/coldfusion.js
index bc8656a4..0b4ea449 100644
--- a/lib/ace/mode/coldfusion.js
+++ b/lib/ace/mode/coldfusion.js
@@ -34,7 +34,6 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var lang = require("../lib/lang");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ColdfusionHighlightRules = require("./coldfusion_highlight_rules").ColdfusionHighlightRules;
 
 var voidElements = "cfabort|cfapplication|cfargument|cfassociate|cfbreak|cfcache|cfcollection|cfcookie|cfdbinfo|cfdirectory|cfdump|cfelse|cfelseif|cferror|cfexchangecalendar|cfexchangeconnection|cfexchangecontact|cfexchangefilter|cfexchangetask|cfexit|cffeed|cffile|cfflush|cfftp|cfheader|cfhtmlhead|cfhttpparam|cfimage|cfimport|cfinclude|cfindex|cfinsert|cfinvokeargument|cflocation|cflog|cfmailparam|cfNTauthenticate|cfobject|cfobjectcache|cfparam|cfpdfformparam|cfprint|cfprocparam|cfprocresult|cfproperty|cfqueryparam|cfregistry|cfreportparam|cfrethrow|cfreturn|cfschedule|cfsearch|cfset|cfsetting|cfthrow|cfzipparam)".split("|");
diff --git a/lib/ace/mode/csharp.js b/lib/ace/mode/csharp.js
index 4b0709ef..a3b2964f 100644
--- a/lib/ace/mode/csharp.js
+++ b/lib/ace/mode/csharp.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js
index 6ef2dfdd..c74bd654 100644
--- a/lib/ace/mode/css.js
+++ b/lib/ace/mode/css.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var WorkerClient = require("../worker/worker_client").WorkerClient;
diff --git a/lib/ace/mode/curly.js b/lib/ace/mode/curly.js
index 60246dad..f7c42af9 100644
--- a/lib/ace/mode/curly.js
+++ b/lib/ace/mode/curly.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 // defines the parent mode
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var HtmlFoldMode = require("./folding/html").FoldMode;
diff --git a/lib/ace/mode/d.js b/lib/ace/mode/d.js
index 7c1551d9..7c3a53c1 100644
--- a/lib/ace/mode/d.js
+++ b/lib/ace/mode/d.js
@@ -37,7 +37,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var DHighlightRules = require("./d_highlight_rules").DHighlightRules;
 var FoldMode = require("./folding/cstyle").FoldMode;
 
diff --git a/lib/ace/mode/dart.js b/lib/ace/mode/dart.js
index 0df4ca99..ba9fff18 100644
--- a/lib/ace/mode/dart.js
+++ b/lib/ace/mode/dart.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var CMode = require("./c_cpp").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var DartHighlightRules = require("./dart_highlight_rules").DartHighlightRules;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
diff --git a/lib/ace/mode/diff.js b/lib/ace/mode/diff.js
index 18cb0dbd..1ef2d399 100644
--- a/lib/ace/mode/diff.js
+++ b/lib/ace/mode/diff.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HighlightRules = require("./diff_highlight_rules").DiffHighlightRules;
 var FoldMode = require("./folding/diff").FoldMode;
 
diff --git a/lib/ace/mode/django.js b/lib/ace/mode/django.js
index 6f0c5abe..362d30e3 100644
--- a/lib/ace/mode/django.js
+++ b/lib/ace/mode/django.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
diff --git a/lib/ace/mode/dot.js b/lib/ace/mode/dot.js
index 67fd0a79..53ea6be8 100644
--- a/lib/ace/mode/dot.js
+++ b/lib/ace/mode/dot.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var DotHighlightRules = require("./dot_highlight_rules").DotHighlightRules;
 var DotFoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/ejs.js b/lib/ace/mode/ejs.js
index 34ee8701..e3fc686f 100644
--- a/lib/ace/mode/ejs.js
+++ b/lib/ace/mode/ejs.js
@@ -84,7 +84,6 @@ exports.EjsHighlightRules = EjsHighlightRules;
 
 
 var oop = require("../lib/oop");
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HtmlMode = require("./html").Mode;
 var JavaScriptMode = require("./javascript").Mode;
 var CssMode = require("./css").Mode;
diff --git a/lib/ace/mode/erlang.js b/lib/ace/mode/erlang.js
index b9203cd3..3d4f9641 100644
--- a/lib/ace/mode/erlang.js
+++ b/lib/ace/mode/erlang.js
@@ -37,7 +37,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ErlangHighlightRules = require("./erlang_highlight_rules").ErlangHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/forth.js b/lib/ace/mode/forth.js
index 53b5b491..31e8d512 100644
--- a/lib/ace/mode/forth.js
+++ b/lib/ace/mode/forth.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ForthHighlightRules = require("./forth_highlight_rules").ForthHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/ftl.js b/lib/ace/mode/ftl.js
index c326423a..b818b87e 100644
--- a/lib/ace/mode/ftl.js
+++ b/lib/ace/mode/ftl.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var FtlHighlightRules = require("./ftl_highlight_rules").FtlHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/gherkin.js b/lib/ace/mode/gherkin.js
index 557ce9fc..98d9b0a3 100644
--- a/lib/ace/mode/gherkin.js
+++ b/lib/ace/mode/gherkin.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var GherkinHighlightRules = require("./gherkin_highlight_rules").GherkinHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/glsl.js b/lib/ace/mode/glsl.js
index d15f94ab..dab63106 100644
--- a/lib/ace/mode/glsl.js
+++ b/lib/ace/mode/glsl.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var CMode = require("./c_cpp").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var glslHighlightRules = require("./glsl_highlight_rules").glslHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/golang.js b/lib/ace/mode/golang.js
index 9b2c646d..a13fbb24 100644
--- a/lib/ace/mode/golang.js
+++ b/lib/ace/mode/golang.js
@@ -2,7 +2,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var GolangHighlightRules = require("./golang_highlight_rules").GolangHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/groovy.js b/lib/ace/mode/groovy.js
index b2becde8..107998bf 100644
--- a/lib/ace/mode/groovy.js
+++ b/lib/ace/mode/groovy.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/haml.js b/lib/ace/mode/haml.js
index 7625b038..f6a59e23 100644
--- a/lib/ace/mode/haml.js
+++ b/lib/ace/mode/haml.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HamlHighlightRules = require("./haml_highlight_rules").HamlHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/handlebars.js b/lib/ace/mode/handlebars.js
index 2346d5e2..38af7e5c 100644
--- a/lib/ace/mode/handlebars.js
+++ b/lib/ace/mode/handlebars.js
@@ -5,7 +5,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HandlebarsHighlightRules = require("./handlebars_highlight_rules").HandlebarsHighlightRules;
 var HtmlBehaviour = require("./behaviour/html").HtmlBehaviour;
 var HtmlFoldMode = require("./folding/html").FoldMode;
diff --git a/lib/ace/mode/haskell.js b/lib/ace/mode/haskell.js
index f817c777..05cc94a0 100644
--- a/lib/ace/mode/haskell.js
+++ b/lib/ace/mode/haskell.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HaskellHighlightRules = require("./haskell_highlight_rules").HaskellHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/haxe.js b/lib/ace/mode/haxe.js
index aefdcd1b..e2ac5a26 100644
--- a/lib/ace/mode/haxe.js
+++ b/lib/ace/mode/haxe.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HaxeHighlightRules = require("./haxe_highlight_rules").HaxeHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index ab202a70..5f5719d4 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -36,7 +36,6 @@ var lang = require("../lib/lang");
 var TextMode = require("./text").Mode;
 var JavaScriptMode = require("./javascript").Mode;
 var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
 var HtmlFoldMode = require("./folding/html").FoldMode;
diff --git a/lib/ace/mode/html_ruby.js b/lib/ace/mode/html_ruby.js
index dc25293a..ab9aa083 100644
--- a/lib/ace/mode/html_ruby.js
+++ b/lib/ace/mode/html_ruby.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HtmlRubyHighlightRules = require("./html_ruby_highlight_rules").HtmlRubyHighlightRules;
 var HtmlMode = require("./html").Mode;
 var JavaScriptMode = require("./javascript").Mode;
diff --git a/lib/ace/mode/ini.js b/lib/ace/mode/ini.js
index 6a353dc7..196405f5 100644
--- a/lib/ace/mode/ini.js
+++ b/lib/ace/mode/ini.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var IniHighlightRules = require("./ini_highlight_rules").IniHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/ini").FoldMode;
diff --git a/lib/ace/mode/jack.js b/lib/ace/mode/jack.js
index ea0fd72a..73267c4b 100644
--- a/lib/ace/mode/jack.js
+++ b/lib/ace/mode/jack.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HighlightRules = require("./jack_highlight_rules").JackHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/jade.js b/lib/ace/mode/jade.js
index 3ce53d14..d298dac4 100644
--- a/lib/ace/mode/jade.js
+++ b/lib/ace/mode/jade.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/java.js b/lib/ace/mode/java.js
index 4034a88a..58df0c96 100644
--- a/lib/ace/mode/java.js
+++ b/lib/ace/mode/java.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js
index ed2616e8..af62ae76 100644
--- a/lib/ace/mode/javascript.js
+++ b/lib/ace/mode/javascript.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/json.js b/lib/ace/mode/json.js
index c1a64ec6..24a43d0f 100644
--- a/lib/ace/mode/json.js
+++ b/lib/ace/mode/json.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HighlightRules = require("./json_highlight_rules").JsonHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/jsp.js b/lib/ace/mode/jsp.js
index bf560eee..c1cb0254 100644
--- a/lib/ace/mode/jsp.js
+++ b/lib/ace/mode/jsp.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JspHighlightRules = require("./jsp_highlight_rules").JspHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/jsx.js b/lib/ace/mode/jsx.js
index 89c91e6e..2406a232 100644
--- a/lib/ace/mode/jsx.js
+++ b/lib/ace/mode/jsx.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JsxHighlightRules = require("./jsx_highlight_rules").JsxHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/julia.js b/lib/ace/mode/julia.js
index ebf60504..ddba928f 100644
--- a/lib/ace/mode/julia.js
+++ b/lib/ace/mode/julia.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var JuliaHighlightRules = require("./julia_highlight_rules").JuliaHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/latex.js b/lib/ace/mode/latex.js
index 743105b3..1f8c07cb 100644
--- a/lib/ace/mode/latex.js
+++ b/lib/ace/mode/latex.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LatexHighlightRules = require("./latex_highlight_rules").LatexHighlightRules;
 var LatexFoldMode = require("./folding/latex").FoldMode;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/less.js b/lib/ace/mode/less.js
index aaa9ab78..658efb3e 100644
--- a/lib/ace/mode/less.js
+++ b/lib/ace/mode/less.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CssBehaviour = require("./behaviour/css").CssBehaviour;
diff --git a/lib/ace/mode/liquid.js b/lib/ace/mode/liquid.js
index c8383fdb..b16c2194 100644
--- a/lib/ace/mode/liquid.js
+++ b/lib/ace/mode/liquid.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LiquidHighlightRules = require("./liquid_highlight_rules").LiquidHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/lisp.js b/lib/ace/mode/lisp.js
index 59f3bf31..59c97939 100644
--- a/lib/ace/mode/lisp.js
+++ b/lib/ace/mode/lisp.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LispHighlightRules = require("./lisp_highlight_rules").LispHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/logiql.js b/lib/ace/mode/logiql.js
index b65358d1..be1cb7c1 100644
--- a/lib/ace/mode/logiql.js
+++ b/lib/ace/mode/logiql.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LogiQLHighlightRules = require("./logiql_highlight_rules").LogiQLHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 var TokenIterator = require("../token_iterator").TokenIterator;
diff --git a/lib/ace/mode/logiql_test.js b/lib/ace/mode/logiql_test.js
index 3e661829..1a6e4c08 100644
--- a/lib/ace/mode/logiql_test.js
+++ b/lib/ace/mode/logiql_test.js
@@ -36,7 +36,6 @@ define(function(require, exports, module) {
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LogiQLMode = require("./logiql").Mode;
 var assert = require("../test/assertions");
 
diff --git a/lib/ace/mode/lsl.js b/lib/ace/mode/lsl.js
index 82fa5223..14a67244 100644
--- a/lib/ace/mode/lsl.js
+++ b/lib/ace/mode/lsl.js
@@ -31,7 +31,6 @@
 define(function(require, exports, module) {
 "use strict";
 
-var Tokenizer = require("../tokenizer").Tokenizer;
 var Rules = require("./lsl_highlight_rules").LSLHighlightRules;
 var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/lua.js b/lib/ace/mode/lua.js
index fa870ffd..a8d1f08b 100644
--- a/lib/ace/mode/lua.js
+++ b/lib/ace/mode/lua.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
 var LuaFoldMode = require("./folding/lua").FoldMode;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/luapage.js b/lib/ace/mode/luapage.js
index 19f5d04f..5ea79d14 100644
--- a/lib/ace/mode/luapage.js
+++ b/lib/ace/mode/luapage.js
@@ -4,7 +4,6 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
 var LuaMode = require("./lua").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LuaPageHighlightRules = require("./luapage_highlight_rules").LuaPageHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/lucene.js b/lib/ace/mode/lucene.js
index 7c10e611..56743ef9 100644
--- a/lib/ace/mode/lucene.js
+++ b/lib/ace/mode/lucene.js
@@ -3,11 +3,10 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LuceneHighlightRules = require("./lucene_highlight_rules").LuceneHighlightRules;
 
 var Mode = function() {
-    this.$tokenizer =  new Tokenizer(new LuceneHighlightRules().getRules());
+    this.HighlightRules = LuceneHighlightRules;
 };
 
 oop.inherits(Mode, TextMode);
diff --git a/lib/ace/mode/makefile.js b/lib/ace/mode/makefile.js
index 4b95d630..673f8927 100644
--- a/lib/ace/mode/makefile.js
+++ b/lib/ace/mode/makefile.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MakefileHighlightRules = require("./makefile_highlight_rules").MakefileHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/markdown.js b/lib/ace/mode/markdown.js
index 934f316a..efabed89 100644
--- a/lib/ace/mode/markdown.js
+++ b/lib/ace/mode/markdown.js
@@ -36,7 +36,6 @@ var TextMode = require("./text").Mode;
 var JavaScriptMode = require("./javascript").Mode;
 var XmlMode = require("./xml").Mode;
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules;
 var MarkdownFoldMode = require("./folding/markdown").FoldMode;
 
diff --git a/lib/ace/mode/matlab.js b/lib/ace/mode/matlab.js
index ca1d3e97..44b20d0d 100644
--- a/lib/ace/mode/matlab.js
+++ b/lib/ace/mode/matlab.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MatlabHighlightRules = require("./matlab_highlight_rules").MatlabHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/mel.js b/lib/ace/mode/mel.js
index d892a1a5..e8922a1c 100644
--- a/lib/ace/mode/mel.js
+++ b/lib/ace/mode/mel.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MELHighlightRules = require("./mel_highlight_rules").MELHighlightRules;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/mushcode.js b/lib/ace/mode/mushcode.js
index 4501e6c9..ec145b6e 100644
--- a/lib/ace/mode/mushcode.js
+++ b/lib/ace/mode/mushcode.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MushCodeRules = require("./mushcode_highlight_rules").MushCodeRules;
 var PythonFoldMode = require("./folding/pythonic").FoldMode;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/mysql.js b/lib/ace/mode/mysql.js
index 567541f5..d0f7c123 100644
--- a/lib/ace/mode/mysql.js
+++ b/lib/ace/mode/mysql.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("../mode/text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MysqlHighlightRules = require("./mysql_highlight_rules").MysqlHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/nix.js b/lib/ace/mode/nix.js
index b7583af6..c8e62a08 100644
--- a/lib/ace/mode/nix.js
+++ b/lib/ace/mode/nix.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var CMode = require("./c_cpp").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var NixHighlightRules = require("./nix_highlight_rules").NixHighlightRules;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
diff --git a/lib/ace/mode/objectivec.js b/lib/ace/mode/objectivec.js
index e982c9ae..99fdb410 100644
--- a/lib/ace/mode/objectivec.js
+++ b/lib/ace/mode/objectivec.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ObjectiveCHighlightRules = require("./objectivec_highlight_rules").ObjectiveCHighlightRules;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
diff --git a/lib/ace/mode/ocaml.js b/lib/ace/mode/ocaml.js
index 189f0f60..6313d3fb 100644
--- a/lib/ace/mode/ocaml.js
+++ b/lib/ace/mode/ocaml.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/pascal.js b/lib/ace/mode/pascal.js
index a40b8156..944088ca 100644
--- a/lib/ace/mode/pascal.js
+++ b/lib/ace/mode/pascal.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PascalHighlightRules = require("./pascal_highlight_rules").PascalHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/coffee").FoldMode;
diff --git a/lib/ace/mode/perl.js b/lib/ace/mode/perl.js
index 7cb54e74..69c4d27e 100644
--- a/lib/ace/mode/perl.js
+++ b/lib/ace/mode/perl.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/pgsql.js b/lib/ace/mode/pgsql.js
index 36e9531c..d9775837 100755
--- a/lib/ace/mode/pgsql.js
+++ b/lib/ace/mode/pgsql.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("../mode/text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PgsqlHighlightRules = require("./pgsql_highlight_rules").PgsqlHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js
index 26ccd99d..beeefda7 100644
--- a/lib/ace/mode/php.js
+++ b/lib/ace/mode/php.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PhpHighlightRules = require("./php_highlight_rules").PhpHighlightRules;
 var PhpLangHighlightRules = require("./php_highlight_rules").PhpLangHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/plain_text.js b/lib/ace/mode/plain_text.js
index 8ac3c4c0..850fbd2b 100644
--- a/lib/ace/mode/plain_text.js
+++ b/lib/ace/mode/plain_text.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var Behaviour = require("./behaviour").Behaviour;
 
diff --git a/lib/ace/mode/powershell.js b/lib/ace/mode/powershell.js
index 3177c19a..11c63298 100644
--- a/lib/ace/mode/powershell.js
+++ b/lib/ace/mode/powershell.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PowershellHighlightRules = require("./powershell_highlight_rules").PowershellHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
diff --git a/lib/ace/mode/prolog.js b/lib/ace/mode/prolog.js
index 5a054baa..dc64b7ea 100644
--- a/lib/ace/mode/prolog.js
+++ b/lib/ace/mode/prolog.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PrologHighlightRules = require("./prolog_highlight_rules").PrologHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/properties.js b/lib/ace/mode/properties.js
index aeeadfde..558e52e7 100644
--- a/lib/ace/mode/properties.js
+++ b/lib/ace/mode/properties.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PropertiesHighlightRules = require("./properties_highlight_rules").PropertiesHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/protobuf.js b/lib/ace/mode/protobuf.js
index 997c4f68..6925f4a9 100644
--- a/lib/ace/mode/protobuf.js
+++ b/lib/ace/mode/protobuf.js
@@ -42,17 +42,13 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var CMode = require("./c_cpp").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ProtobufHighlightRules = require("./protobuf_highlight_rules").ProtobufHighlightRules;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
     CMode.call(this);
-    var highlighter = new ProtobufHighlightRules();
     this.foldingRules = new CStyleFoldMode();
-
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$keywordList = highlighter.$keywordList;
+    this.HighlightRules = ProtobufHighlightRules;
 };
 oop.inherits(Mode, CMode);
 
diff --git a/lib/ace/mode/python.js b/lib/ace/mode/python.js
index fa4ea2b0..c4e6cebe 100644
--- a/lib/ace/mode/python.js
+++ b/lib/ace/mode/python.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
 var PythonFoldMode = require("./folding/pythonic").FoldMode;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/r.js b/lib/ace/mode/r.js
index dfb326aa..addedd1a 100644
--- a/lib/ace/mode/r.js
+++ b/lib/ace/mode/r.js
@@ -41,7 +41,6 @@ define(function(require, exports, module) {
    var Range = require("../range").Range;
    var oop = require("../lib/oop");
    var TextMode = require("./text").Mode;
-   var Tokenizer = require("../tokenizer").Tokenizer;
    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
    var RHighlightRules = require("./r_highlight_rules").RHighlightRules;
    var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/rdoc.js b/lib/ace/mode/rdoc.js
index 13e9ff21..bd99d4ba 100644
--- a/lib/ace/mode/rdoc.js
+++ b/lib/ace/mode/rdoc.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var RDocHighlightRules = require("./rdoc_highlight_rules").RDocHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/rhtml.js b/lib/ace/mode/rhtml.js
index 878f7699..a70cfb1f 100644
--- a/lib/ace/mode/rhtml.js
+++ b/lib/ace/mode/rhtml.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 
 var RHtmlHighlightRules = require("./rhtml_highlight_rules").RHtmlHighlightRules;
 /* Make life easier, don't do these right now 
diff --git a/lib/ace/mode/ruby.js b/lib/ace/mode/ruby.js
index 7777cfaa..27bc6c38 100644
--- a/lib/ace/mode/ruby.js
+++ b/lib/ace/mode/ruby.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/ruby_test.js b/lib/ace/mode/ruby_test.js
index 25548f02..97efb0ea 100644
--- a/lib/ace/mode/ruby_test.js
+++ b/lib/ace/mode/ruby_test.js
@@ -36,7 +36,6 @@ define(function(require, exports, module) {
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var Mode = require("./ruby").Mode;
 var assert = require("../test/assertions");
 
diff --git a/lib/ace/mode/rust.js b/lib/ace/mode/rust.js
index de1bd417..03570e4a 100644
--- a/lib/ace/mode/rust.js
+++ b/lib/ace/mode/rust.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var RustHighlightRules = require("./rust_highlight_rules").RustHighlightRules;
 // TODO: pick appropriate fold mode
 var FoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/sass.js b/lib/ace/mode/sass.js
index 883be140..3025e71e 100644
--- a/lib/ace/mode/sass.js
+++ b/lib/ace/mode/sass.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SassHighlightRules = require("./sass_highlight_rules").SassHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/scad.js b/lib/ace/mode/scad.js
index 0a79f63e..78c77f10 100644
--- a/lib/ace/mode/scad.js
+++ b/lib/ace/mode/scad.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var scadHighlightRules = require("./scad_highlight_rules").scadHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
diff --git a/lib/ace/mode/scala.js b/lib/ace/mode/scala.js
index 7788c1a9..be7ccc5d 100644
--- a/lib/ace/mode/scala.js
+++ b/lib/ace/mode/scala.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/scheme.js b/lib/ace/mode/scheme.js
index 96814452..aa462a10 100644
--- a/lib/ace/mode/scheme.js
+++ b/lib/ace/mode/scheme.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SchemeHighlightRules = require("./scheme_highlight_rules").SchemeHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/scss.js b/lib/ace/mode/scss.js
index 70c8ed69..f672d257 100644
--- a/lib/ace/mode/scss.js
+++ b/lib/ace/mode/scss.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CssBehaviour = require("./behaviour/css").CssBehaviour;
diff --git a/lib/ace/mode/sh.js b/lib/ace/mode/sh.js
index 7b20109d..b7837ae2 100644
--- a/lib/ace/mode/sh.js
+++ b/lib/ace/mode/sh.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var ShHighlightRules = require("./sh_highlight_rules").ShHighlightRules;
 var Range = require("../range").Range;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/sjs.js b/lib/ace/mode/sjs.js
index e73b62fc..6c440f76 100644
--- a/lib/ace/mode/sjs.js
+++ b/lib/ace/mode/sjs.js
@@ -32,19 +32,15 @@ define(function(require, exports, module) {
 "use strict";
 var oop = require("../lib/oop");
 var JSMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SJSHighlightRules = require("./sjs_highlight_rules").SJSHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
-    var highlighter = new SJSHighlightRules();
-
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.HighlightRules = SJSHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
-    this.$keywordList = highlighter.$keywordList;
     this.foldingRules = new CStyleFoldMode();
 };
 oop.inherits(Mode, JSMode);
diff --git a/lib/ace/mode/smarty.js b/lib/ace/mode/smarty.js
index c4e445c2..b88f1f68 100644
--- a/lib/ace/mode/smarty.js
+++ b/lib/ace/mode/smarty.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SmartyHighlightRules = require("./smarty_highlight_rules").SmartyHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/snippets.js b/lib/ace/mode/snippets.js
index faf2000a..638e9393 100644
--- a/lib/ace/mode/snippets.js
+++ b/lib/ace/mode/snippets.js
@@ -3,7 +3,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 var SnippetHighlightRules = function() {
diff --git a/lib/ace/mode/soy_template.js b/lib/ace/mode/soy_template.js
index 95290e9d..fec98402 100644
--- a/lib/ace/mode/soy_template.js
+++ b/lib/ace/mode/soy_template.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SoyTemplateHighlightRules = require("./soy_template_highlight_rules").SoyTemplateHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/space.js b/lib/ace/mode/space.js
index c82b3ccd..6117d053 100644
--- a/lib/ace/mode/space.js
+++ b/lib/ace/mode/space.js
@@ -1,16 +1,15 @@
+
 define(function(require, exports, module) {
 "use strict";
 var oop = require("../lib/oop");
 // defines the parent mode
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var FoldMode = require("./folding/coffee").FoldMode;
 // defines the language specific highlighters and folding rules
 var SpaceHighlightRules = require("./space_highlight_rules").SpaceHighlightRules;
 var Mode = function() {
     // set everything up
-    var highlighter = new SpaceHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.HighlightRules = SpaceHighlightRules;
     this.foldingRules = new FoldMode();
 };
 oop.inherits(Mode, TextMode);
diff --git a/lib/ace/mode/sql.js b/lib/ace/mode/sql.js
index 100f539b..e1bf0f14 100644
--- a/lib/ace/mode/sql.js
+++ b/lib/ace/mode/sql.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/stylus.js b/lib/ace/mode/stylus.js
index 677a095c..ebeb1fca 100644
--- a/lib/ace/mode/stylus.js
+++ b/lib/ace/mode/stylus.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var StylusHighlightRules = require("./stylus_highlight_rules").StylusHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
diff --git a/lib/ace/mode/svg.js b/lib/ace/mode/svg.js
index aede9c0a..8c608e82 100644
--- a/lib/ace/mode/svg.js
+++ b/lib/ace/mode/svg.js
@@ -34,7 +34,6 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var XmlMode = require("./xml").Mode;
 var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules;
 var MixedFoldMode = require("./folding/mixed").FoldMode;
 var XmlFoldMode = require("./folding/xml").FoldMode;
diff --git a/lib/ace/mode/tcl.js b/lib/ace/mode/tcl.js
index b1618a4a..09f09a7b 100644
--- a/lib/ace/mode/tcl.js
+++ b/lib/ace/mode/tcl.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 var TclHighlightRules = require("./tcl_highlight_rules").TclHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/tex.js b/lib/ace/mode/tex.js
index eebb1b4d..d36721db 100644
--- a/lib/ace/mode/tex.js
+++ b/lib/ace/mode/tex.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var TexHighlightRules = require("./tex_highlight_rules").TexHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/textile.js b/lib/ace/mode/textile.js
index 94f769df..d5525969 100644
--- a/lib/ace/mode/textile.js
+++ b/lib/ace/mode/textile.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TextileHighlightRules = require("./textile_highlight_rules").TextileHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 
diff --git a/lib/ace/mode/toml.js b/lib/ace/mode/toml.js
index 704c5929..9f84323c 100644
--- a/lib/ace/mode/toml.js
+++ b/lib/ace/mode/toml.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TomlHighlightRules = require("./toml_highlight_rules").TomlHighlightRules;
 var FoldMode = require("./folding/ini").FoldMode;
 
diff --git a/lib/ace/mode/typescript.js b/lib/ace/mode/typescript.js
index 54bd71b2..06020f6d 100644
--- a/lib/ace/mode/typescript.js
+++ b/lib/ace/mode/typescript.js
@@ -37,7 +37,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var jsMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var TypeScriptHighlightRules = require("./typescript_highlight_rules").TypeScriptHighlightRules;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
diff --git a/lib/ace/mode/vbscript.js b/lib/ace/mode/vbscript.js
index 89b16613..ed0ec61d 100644
--- a/lib/ace/mode/vbscript.js
+++ b/lib/ace/mode/vbscript.js
@@ -42,7 +42,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var VBScriptHighlightRules = require("./vbscript_highlight_rules").VBScriptHighlightRules;
 
 var Mode = function() {
diff --git a/lib/ace/mode/velocity.js b/lib/ace/mode/velocity.js
index ca572a21..94cbd388 100644
--- a/lib/ace/mode/velocity.js
+++ b/lib/ace/mode/velocity.js
@@ -38,7 +38,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var VelocityHighlightRules = require("./velocity_highlight_rules").VelocityHighlightRules;
 var FoldMode = require("./folding/velocity").FoldMode;
 
diff --git a/lib/ace/mode/verilog.js b/lib/ace/mode/verilog.js
index bc08331d..1c7f3ef5 100644
--- a/lib/ace/mode/verilog.js
+++ b/lib/ace/mode/verilog.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var VerilogHighlightRules = require("./verilog_highlight_rules").VerilogHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/vhdl.js b/lib/ace/mode/vhdl.js
index 7c2c25ef..263e7fcd 100644
--- a/lib/ace/mode/vhdl.js
+++ b/lib/ace/mode/vhdl.js
@@ -32,7 +32,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var VHDLHighlightRules = require("./vhdl_highlight_rules").VHDLHighlightRules;
 var Range = require("../range").Range;
 
diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js
index fe714d7c..9b1d2f0a 100644
--- a/lib/ace/mode/xml.js
+++ b/lib/ace/mode/xml.js
@@ -34,7 +34,6 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var lang = require("../lib/lang");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
 var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
 var XmlFoldMode = require("./folding/xml").FoldMode;
diff --git a/lib/ace/mode/yaml.js b/lib/ace/mode/yaml.js
index f81971fe..8f7782c3 100644
--- a/lib/ace/mode/yaml.js
+++ b/lib/ace/mode/yaml.js
@@ -33,7 +33,6 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var YamlHighlightRules = require("./yaml_highlight_rules").YamlHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var FoldMode = require("./folding/coffee").FoldMode;