diff --git a/Calendar.js b/Calendar.js
index da01c0883..d5fdd5ba8 100644
--- a/Calendar.js
+++ b/Calendar.js
@@ -18,14 +18,6 @@ define([
 ], function(array, date, local, declare, domAttr, domClass, event, kernel, keys, lang, has,
 			CalendarLite, _Widget, _CssStateMixin, _TemplatedMixin, DropDownButton){
 
-/*=====
-	var CalendarLite = dijit.CalendarLite;
-	var _CssStateMixin = dijit._CssStateMixin;
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var DropDownButton = dijit.form.DropDownButton;
-=====*/
-
 	// module:
 	//		dijit/Calendar
 	// summary:
diff --git a/CalendarLite.js b/CalendarLite.js
index b30e40c87..0894526ee 100644
--- a/CalendarLite.js
+++ b/CalendarLite.js
@@ -18,10 +18,6 @@ define([
 ], function(array, declare, cldrSupplemental, date, locale, stamp, dom, domClass, event, lang, has, string,
 			_WidgetBase, _TemplatedMixin, template){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
 
 	// module:
 	//		dijit/CalendarLite
diff --git a/CheckedMenuItem.js b/CheckedMenuItem.js
index 99d61e044..15ac6f4d1 100644
--- a/CheckedMenuItem.js
+++ b/CheckedMenuItem.js
@@ -6,10 +6,6 @@ define([
 	"./hccss"
 ], function(declare, domClass, MenuItem, template){
 
-/*=====
-	var MenuItem = dijit.MenuItem;
-=====*/
-
 	// module:
 	//		dijit/CheckedMenuItem
 	// summary:
diff --git a/ColorPalette.js b/ColorPalette.js
index 93be0d189..56e692811 100644
--- a/ColorPalette.js
+++ b/ColorPalette.js
@@ -15,12 +15,6 @@ define([
 ], function(require, template, _Widget, _TemplatedMixin, _PaletteMixin, has, i18n, Color,
 	declare, domConstruct, string){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _PaletteMixin = dijit._PaletteMixin;
-=====*/
-
 // module:
 //		dijit/ColorPalette
 // summary:
diff --git a/Declaration.js b/Declaration.js
index e885277ce..e180dcc3f 100644
--- a/Declaration.js
+++ b/Declaration.js
@@ -11,12 +11,6 @@ define([
 	"dojo/NodeList-dom"
 ], function(array, connect, declare, lang, parser, query, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
-=====*/
-
 	// module:
 	//		dijit/Declaration
 	// summary:
@@ -75,9 +69,11 @@ define([
 			// map array of strings like [ "dijit.form.Button" ] to array of mixin objects
 			// (note that array.map(this.mixins, lang.getObject) doesn't work because it passes
 			// a bogus third argument to getObject(), confusing it)
-			this.mixins = this.mixins.length ?
-				array.map(this.mixins, function(name){ return lang.getObject(name); } ) :
-				[ _Widget, _TemplatedMixin, _WidgetsInTemplateMixin ];
+			if(this.mixins.length){
+				this.mixins = array.map(this.mixins, function(name){ return lang.getObject(name); } );
+			}else{
+				this.mixins = [ _Widget, _TemplatedMixin, _WidgetsInTemplateMixin ];
+			}
 
 			propList._skipNodeCache = true;
 			propList.templateString =
diff --git a/Dialog.js b/Dialog.js
index af9cb3650..96a319acb 100644
--- a/Dialog.js
+++ b/Dialog.js
@@ -35,15 +35,6 @@ define([
 			dom, domClass, domGeometry, domStyle, event, fx, i18n, keys, lang, on, ready, has, winUtils,
 			Moveable, TimedMoveable, focus, manager, _Widget, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin,
 			DialogUnderlay, ContentPane, template, dijit){
-	
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _CssStateMixin = dijit._CssStateMixin;
-	var _FormMixin = dijit.form._FormMixin;
-	var _DialogMixin = dijit._DialogMixin;
-=====*/	
-
 
 	// module:
 	//		dijit/Dialog
diff --git a/DialogUnderlay.js b/DialogUnderlay.js
index 41729218f..63ff20e75 100644
--- a/DialogUnderlay.js
+++ b/DialogUnderlay.js
@@ -7,11 +7,6 @@ define([
 	"./BackgroundIframe"
 ], function(declare, domAttr, winUtils, _Widget, _TemplatedMixin, BackgroundIframe){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 	// module:
 	//		dijit/DialogUnderlay
 	// summary:
diff --git a/DropDownMenu.js b/DropDownMenu.js
index e85557347..82f47866c 100644
--- a/DropDownMenu.js
+++ b/DropDownMenu.js
@@ -7,11 +7,6 @@ define([
 	"./_MenuBase"
 ], function(declare, event, keys, template, _OnDijitClickMixin, _MenuBase){
 
-/*=====
-	var _MenuBase = dijit._MenuBase;
-	var _OnDijitClickMixin = dijit._OnDijitClickMixin;
-=====*/
-
 	// module:
 	//		dijit/DropDownMenu
 	// summary:
diff --git a/InlineEditBox.js b/InlineEditBox.js
index 1dae508eb..2e338ce9d 100644
--- a/InlineEditBox.js
+++ b/InlineEditBox.js
@@ -24,15 +24,6 @@ define([
 	"dojo/i18n!./nls/common"
 ], function(array, declare, domAttr, domClass, domConstruct, domStyle, event, i18n, kernel, keys, lang, has, when, fm, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, Button, _TextBoxMixin, TextBox, template){
 
-	/*=====
-	 var _Widget = dijit._Widget;
-	 var _TemplatedMixin = dijit._TemplatedMixin;
-	 var _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
-	 var _Container = dijit._Container;
-	 var Button = dijit.form.Button;
-	 var TextBox = dijit.form.TextBox;
-	 =====*/
-
 	// module:
 	//		dijit/InlineEditBox
 	// summary:
diff --git a/Menu.js b/Menu.js
index 256b9595e..572dc4a5b 100644
--- a/Menu.js
+++ b/Menu.js
@@ -19,10 +19,6 @@ define([
 ], function(require, array, declare, event, dom, domAttr, domGeometry, domStyle, keys, lang, on,
 			has, win, winUtils, pm, DropDownMenu, ready){
 
-/*=====
-	var DropDownMenu = dijit.DropDownMenu;
-=====*/
-
 // module:
 //		dijit/Menu
 // summary:
diff --git a/MenuBar.js b/MenuBar.js
index d9c1544d0..06bbc1a6e 100644
--- a/MenuBar.js
+++ b/MenuBar.js
@@ -6,10 +6,6 @@ define([
 	"dojo/text!./templates/MenuBar.html"
 ], function(declare, event, keys, _MenuBase, template){
 
-/*=====
-	var _MenuBase = dijit._MenuBase;
-=====*/
-
 // module:
 //		dijit/MenuBar
 // summary:
diff --git a/MenuBarItem.js b/MenuBarItem.js
index 5a0dd6a14..50e81a5ad 100644
--- a/MenuBarItem.js
+++ b/MenuBarItem.js
@@ -4,10 +4,6 @@ define([
 	"dojo/text!./templates/MenuBarItem.html"
 ], function(declare, MenuItem, template){
 
-/*=====
-	var MenuItem = dijit.MenuItem;
-=====*/
-
 	// module:
 	//		dijit/MenuBarItem
 	// summary:
diff --git a/MenuItem.js b/MenuItem.js
index f81211fe3..4cea773ef 100644
--- a/MenuItem.js
+++ b/MenuItem.js
@@ -13,13 +13,6 @@ define([
 ], function(declare, dom, domAttr, domClass, kernel, has,
 			_Widget, _TemplatedMixin, _Contained, _CssStateMixin, template){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _Contained = dijit._Contained;
-	var _CssStateMixin = dijit._CssStateMixin;
-=====*/
-
 	// module:
 	//		dijit/MenuItem
 	// summary:
diff --git a/MenuSeparator.js b/MenuSeparator.js
index 44c209a7b..40c717db0 100644
--- a/MenuSeparator.js
+++ b/MenuSeparator.js
@@ -7,12 +7,6 @@ define([
 	"dojo/text!./templates/MenuSeparator.html"
 ], function(declare, dom, _WidgetBase, _TemplatedMixin, _Contained, template){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _Contained = dijit._Contained;
-=====*/
-
 	// module:
 	//		dijit/MenuSeparator
 	// summary:
diff --git a/PopupMenuBarItem.js b/PopupMenuBarItem.js
index 04e8d202d..77bbba0a8 100644
--- a/PopupMenuBarItem.js
+++ b/PopupMenuBarItem.js
@@ -11,11 +11,6 @@ define([
 
 	var _MenuBarItemMixin = MenuBarItem._MenuBarItemMixin;
 
-/*=====
-	var PopupMenuItem = dijit.PopupMenuItem;
-	var _MenuBarItemMixin = dijit._MenuBarItemMixin;
-=====*/
-
 	return declare("dijit.PopupMenuBarItem", [PopupMenuItem, _MenuBarItemMixin], {
 		// summary:
 		//		Item in a MenuBar like "File" or "Edit", that spawns a submenu when pressed (or hovered)
diff --git a/PopupMenuItem.js b/PopupMenuItem.js
index 2cd6c87af..31e89b20c 100644
--- a/PopupMenuItem.js
+++ b/PopupMenuItem.js
@@ -7,10 +7,6 @@ define([
 	"./hccss"
 ], function(declare, domStyle, query, registry, MenuItem){
 
-/*=====
-	var MenuItem = dijit.MenuItem;
-=====*/
-
 	// module:
 	//		dijit/PopupMenuItem
 	// summary:
diff --git a/ProgressBar.js b/ProgressBar.js
index 408f32b80..3a6a6d4de 100644
--- a/ProgressBar.js
+++ b/ProgressBar.js
@@ -9,11 +9,6 @@ define([
 	"dojo/text!./templates/ProgressBar.html"
 ], function(require, declare, domClass, lang, number, _Widget, _TemplatedMixin, template){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 // module:
 //		dijit/ProgressBar
 // summary:
diff --git a/TitlePane.js b/TitlePane.js
index d3bfa4cdc..ee233937b 100644
--- a/TitlePane.js
+++ b/TitlePane.js
@@ -17,13 +17,6 @@ define([
 ], function(array, declare, dom, domAttr, domClass, domGeometry, event, fxUtils, kernel, keys,
 			_CssStateMixin, _TemplatedMixin, ContentPane, template, manager){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _CssStateMixin = dijit._CssStateMixin;
-	var ContentPane = dijit.layout.ContentPane;
-=====*/
-
 // module:
 //		dijit/TitlePane
 // summary:
diff --git a/Toolbar.js b/Toolbar.js
index 4735616ac..af14892e6 100644
--- a/Toolbar.js
+++ b/Toolbar.js
@@ -9,12 +9,6 @@ define([
 	"./_TemplatedMixin"
 ], function(require, declare, has, keys, ready, _Widget, _KeyNavContainer, _TemplatedMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _KeyNavContainer = dijit._KeyNavContainer;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 	// module:
 	//		dijit/Toolbar
 	// summary:
diff --git a/ToolbarSeparator.js b/ToolbarSeparator.js
index 33a7ca951..49e688a3b 100644
--- a/ToolbarSeparator.js
+++ b/ToolbarSeparator.js
@@ -5,11 +5,6 @@ define([
 	"./_TemplatedMixin"
 ], function(declare, dom, _Widget, _TemplatedMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 	// module:
 	//		dijit/ToolbarSeparator
 	// summary:
diff --git a/Tooltip.js b/Tooltip.js
index 33dd3de67..2bcf62b46 100644
--- a/Tooltip.js
+++ b/Tooltip.js
@@ -20,12 +20,6 @@ define([
 ], function(array, declare, fx, dom, domClass, domGeometry, domStyle, lang, mouse, on, has,
 			manager, place, _Widget, _TemplatedMixin, BackgroundIframe, template, dijit){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var BackgroundIframe = dijit.BackgroundIframe;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 	// module:
 	//		dijit/Tooltip
 	// summary:
diff --git a/TooltipDialog.js b/TooltipDialog.js
index 87432eb7f..1d8a8a0bb 100644
--- a/TooltipDialog.js
+++ b/TooltipDialog.js
@@ -14,13 +14,6 @@ define([
 ], function(declare, domClass, event, keys, lang,
 			focus, ContentPane, _DialogMixin, _FormMixin, _TemplatedMixin, template, dijit){
 
-/*=====
-	var ContentPane = dijit.layout.ContentPane;
-	var _DialogMixin = dijit._DialogMixin;
-	var _FormMixin = dijit.form._FormMixin;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 	// module:
 	//		dijit/TooltipDialog
 	// summary:
diff --git a/Tree.js b/Tree.js
index 00d995fb5..80ec27427 100644
--- a/Tree.js
+++ b/Tree.js
@@ -36,14 +36,6 @@ define([
 			focus, registry, manager, _Widget, _TemplatedMixin, _Container, _Contained, _CssStateMixin,
 			treeNodeTemplate, treeTemplate, TreeStoreModel, ForestStoreModel, _dndSelector){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _CssStateMixin = dijit._CssStateMixin;
-	var _Container = dijit._Container;
-	var _Contained = dijit._Contained;
-=====*/
-
 // module:
 //		dijit/Tree
 // summary:
diff --git a/_BidiSupport.js b/_BidiSupport.js
index 3614d02ce..eac137822 100644
--- a/_BidiSupport.js
+++ b/_BidiSupport.js
@@ -1,9 +1,5 @@
 define(["./_WidgetBase"], function(_WidgetBase){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-====*/
-
 	// module:
 	//		dijit/_BidiSupport
 	// summary:
diff --git a/_FocusMixin.js b/_FocusMixin.js
index e327a445d..3c07f819c 100644
--- a/_FocusMixin.js
+++ b/_FocusMixin.js
@@ -5,10 +5,6 @@ define([
 	"dojo/_base/lang" // lang.extend
 ], function(focus, _WidgetBase, declare, lang){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-=====*/
-
 	// module:
 	//		dijit/_FocusMixin
 	// summary:
diff --git a/_HasDropDown.js b/_HasDropDown.js
index f55e0687a..a6b5bd161 100644
--- a/_HasDropDown.js
+++ b/_HasDropDown.js
@@ -19,9 +19,6 @@ define([
 ], function(declare, Deferred, event,dom, domAttr, domClass, domGeometry, domStyle, has, keys, lang, touch,
 			winUtils, registry, focus, popup, _FocusMixin){
 
-/*=====
-	var _FocusMixin = dijit._FocusMixin;
-=====*/
 
 	// module:
 	//		dijit/_HasDropDown
diff --git a/_KeyNavContainer.js b/_KeyNavContainer.js
index 647653c13..00d1299f8 100644
--- a/_KeyNavContainer.js
+++ b/_KeyNavContainer.js
@@ -10,10 +10,6 @@ define([
 	"dojo/_base/lang" // lang.hitch
 ], function(kernel, _Container, _FocusMixin, array, keys, declare, event, domAttr, lang){
 
-/*=====
-	var _FocusMixin = dijit._FocusMixin;
-	var _Container = dijit._Container;
-=====*/
 
 	// module:
 	//		dijit/_KeyNavContainer
diff --git a/_MenuBase.js b/_MenuBase.js
index 3cfa14e48..277556c87 100644
--- a/_MenuBase.js
+++ b/_MenuBase.js
@@ -17,11 +17,6 @@ define([
 ], function(array, declare, dom, domAttr, domClass, lang, mouse, on, winUtils,
 			pm, registry, _Widget, _KeyNavContainer, _OnDijitClickMixin, _TemplatedMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _KeyNavContainer = dijit._KeyNavContainer;
-=====*/
 
 // module:
 //		dijit/_MenuBase
diff --git a/_PaletteMixin.js b/_PaletteMixin.js
index 26abf6694..1ecfd7069 100644
--- a/_PaletteMixin.js
+++ b/_PaletteMixin.js
@@ -11,10 +11,6 @@ define([
 	"./typematic"
 ], function(declare, domAttr, domClass, domConstruct, event, keys, lang, _CssStateMixin, focus, typematic){
 
-/*=====
-	var _CssStateMixin = dijit._CssStateMixin;
-=====*/
-
 // module:
 //		dijit/_PaletteMixin
 // summary:
diff --git a/_Templated.js b/_Templated.js
index 22e1277c1..970209b9a 100644
--- a/_Templated.js
+++ b/_Templated.js
@@ -8,12 +8,6 @@ define([
 	"dojo/_base/kernel" // kernel.deprecated
 ], function(_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, array, declare, lang, kernel){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
-=====*/
-
 	// module:
 	//		dijit/_Templated
 	// summary:
diff --git a/_TemplatedMixin.js b/_TemplatedMixin.js
index cc904166b..be5527658 100644
--- a/_TemplatedMixin.js
+++ b/_TemplatedMixin.js
@@ -11,10 +11,6 @@ define([
 	"dojo/_base/unload" // unload.addOnWindowUnload
 ], function(lang, touch, _WidgetBase, string, cache, array, declare, domConstruct, has, unload) {
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-=====*/
-
 	// module:
 	//		dijit/_TemplatedMixin
 	// summary:
@@ -54,9 +50,7 @@ define([
 		//		List of widget attribute names associated with data-dojo-attach-point=... in the
 		//		template, ex: ["containerNode", "labelNode"]
 		_attachPoints: [],
- =====*/
 
-/*=====
 		// _attachEvents: [private] Handle[]
 		//		List of connections associated with data-dojo-attach-event=... in the
 		//		template
diff --git a/_TimePicker.js b/_TimePicker.js
index b80b7fb72..e4d913a60 100644
--- a/_TimePicker.js
+++ b/_TimePicker.js
@@ -20,12 +20,6 @@ define([
 ], function(array, ddate, locale, stamp, declare, domClass, domConstruct, event, kernel, keys, lang, has, query,
 			typematic, _Widget, _TemplatedMixin, _FormValueWidget, template){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _FormValueWidget = dijit.form._FormValueWidget;
-=====*/
-
 	// module:
 	//		dijit/_TimePicker
 	// summary:
diff --git a/_Widget.js b/_Widget.js
index 224314a26..364ec7dfe 100644
--- a/_Widget.js
+++ b/_Widget.js
@@ -17,12 +17,6 @@ define([
 ], function(aspect, config, connect, declare, has, kernel, lang, query, ready,
 			registry, _WidgetBase, _OnDijitClickMixin, _FocusMixin){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _OnDijitClickMixin = dijit._OnDijitClickMixin;
-	var _FocusMixin = dijit._FocusMixin;
-=====*/
-
 
 // module:
 //		dijit/_Widget
diff --git a/_WidgetBase.js b/_WidgetBase.js
index f5920ecb1..e8e9ddda5 100644
--- a/_WidgetBase.js
+++ b/_WidgetBase.js
@@ -24,10 +24,6 @@ define([
 			dom, domAttr, domClass, domConstruct, domGeometry, domStyle, has, kernel,
 			lang, on, ready, Stateful, topic, win, registry){
 
-/*=====
-var Stateful = dojo.Stateful;
-=====*/
-
 // module:
 //		dijit/_WidgetBase
 // summary:
diff --git a/_editor/RichText.js b/_editor/RichText.js
index eccf0f9b3..44104e43f 100644
--- a/_editor/RichText.js
+++ b/_editor/RichText.js
@@ -32,11 +32,6 @@ define([
 	event, kernel, keys, lang, on, query, ready, has, topic, unload, _Url, win,
 	_Widget, _CssStateMixin, selectionapi, rangeapi, htmlapi, focus, dijit){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _CssStateMixin = dijit._CssStateMixin;
-=====*/
-
 // module:
 //		dijit/_editor/RichText
 // summary:
diff --git a/_editor/plugins/AlwaysShowToolbar.js b/_editor/plugins/AlwaysShowToolbar.js
index a304e1bc0..163519de5 100644
--- a/_editor/plugins/AlwaysShowToolbar.js
+++ b/_editor/plugins/AlwaysShowToolbar.js
@@ -9,10 +9,6 @@ define([
 	"../_Plugin"
 ], function(declare, domClass, domConstruct, domGeometry, lang, has, win, _Plugin){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 // module:
 //		dijit/_editor/plugins/AlwaysShowToolbar
 // summary:
diff --git a/_editor/plugins/EnterKeyHandling.js b/_editor/plugins/EnterKeyHandling.js
index 341cb0b52..1c0e04874 100644
--- a/_editor/plugins/EnterKeyHandling.js
+++ b/_editor/plugins/EnterKeyHandling.js
@@ -14,9 +14,6 @@ define([
 	"../../_base/focus"
 ], function(declare, domConstruct, event, keys, lang, has, win, winUtils, _Plugin, RichText, rangeapi, selectionapi,
 			baseFocus){
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
 
 // module:
 //		dijit/_editor/plugins/EnterKeyHandling
diff --git a/_editor/plugins/FontChoice.js b/_editor/plugins/FontChoice.js
index 0cd5ab5cc..0a27ae920 100644
--- a/_editor/plugins/FontChoice.js
+++ b/_editor/plugins/FontChoice.js
@@ -17,14 +17,6 @@ define([
 ], function(array, declare, domConstruct, i18n, lang, MemoryStore,
 	registry, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, FilteringSelect, _Plugin, rangeapi, selectionapi){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
-	var FilteringSelect = dijit.form.FilteringSelect;
-=====*/
-
 
 // module:
 //		dijit/_editor/plugins/FontChoice
diff --git a/_editor/plugins/FullScreen.js b/_editor/plugins/FullScreen.js
index 803de0dcb..776aa9cef 100755
--- a/_editor/plugins/FullScreen.js
+++ b/_editor/plugins/FullScreen.js
@@ -20,10 +20,6 @@ define([
 ], function(aspect, declare, domClass, domGeometry, domStyle, event, i18n, keys, lang, on, has, win, winUtils,
 			focus, _Plugin, ToggleButton, registry){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 
 // module:
 //		dijit/_editor/plugins/FullScreen
diff --git a/_editor/plugins/LinkDialog.js b/_editor/plugins/LinkDialog.js
index 1fbfca741..70469cc35 100644
--- a/_editor/plugins/LinkDialog.js
+++ b/_editor/plugins/LinkDialog.js
@@ -14,9 +14,6 @@ define([
 ], function(require, declare, domAttr, keys, lang, has, query, string,
 	_Widget, _Plugin, DropDownButton, rangeapi){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
 
 // module:
 //		dijit/_editor/plugins/LinkDialog
diff --git a/_editor/plugins/NewPage.js b/_editor/plugins/NewPage.js
index 3cd519bb3..67023427b 100644
--- a/_editor/plugins/NewPage.js
+++ b/_editor/plugins/NewPage.js
@@ -7,10 +7,6 @@ define([
 	"dojo/i18n!../nls/commands"
 ], function(declare, i18n, lang, _Plugin, Button){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 // module:
 //		dijit/_editor/plugins/NewPage
 // summary:
diff --git a/_editor/plugins/Print.js b/_editor/plugins/Print.js
index 636f1091b..4e4fbb17d 100755
--- a/_editor/plugins/Print.js
+++ b/_editor/plugins/Print.js
@@ -9,10 +9,6 @@ define([
 	"dojo/i18n!../nls/commands"
 ], function(declare, i18n, lang, has, focus, _Plugin, Button){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 // module:
 //		dijit/_editor/plugins/Print
 // summary:
diff --git a/_editor/plugins/TabIndent.js b/_editor/plugins/TabIndent.js
index 66720b9fa..4afbaa0aa 100644
--- a/_editor/plugins/TabIndent.js
+++ b/_editor/plugins/TabIndent.js
@@ -5,10 +5,6 @@ define([
 	"../../form/ToggleButton"
 ], function(declare, kernel, _Plugin, ToggleButton){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 	// module:
 	//		dijit/_editor/plugins/TabIndent
 	// summary:
diff --git a/_editor/plugins/TextColor.js b/_editor/plugins/TextColor.js
index 7c582e547..246689fda 100644
--- a/_editor/plugins/TextColor.js
+++ b/_editor/plugins/TextColor.js
@@ -7,10 +7,6 @@ define([
 	"../../form/DropDownButton"
 ], function(require, colors, declare, lang, _Plugin, DropDownButton){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 // module:
 //		dijit/_editor/plugins/TextColor
 // summary:
diff --git a/_editor/plugins/ToggleDir.js b/_editor/plugins/ToggleDir.js
index 1a64955ea..58b866b14 100644
--- a/_editor/plugins/ToggleDir.js
+++ b/_editor/plugins/ToggleDir.js
@@ -7,10 +7,6 @@ define([
 	"../../form/ToggleButton"
 ], function(declare, domStyle, kernel, lang, _Plugin, ToggleButton){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 	// module:
 	//		dijit/_editor/plugins/ToggleDir
 	// summary:
diff --git a/_editor/plugins/ViewSource.js b/_editor/plugins/ViewSource.js
index 609033fc6..a3e85cf8b 100755
--- a/_editor/plugins/ViewSource.js
+++ b/_editor/plugins/ViewSource.js
@@ -23,10 +23,6 @@ define([
 ], function(array, declare, domAttr, domConstruct, domGeometry, domStyle, event, i18n, keys, lang, on, has, win,
 	winUtils, focus, _Plugin, ToggleButton, dijit, registry, aspect){
 
-/*=====
-	var _Plugin = dijit._editor._Plugin;
-=====*/
-
 // module:
 //		dijit/_editor/plugins/ViewSource
 // summary:
diff --git a/form/Button.js b/form/Button.js
index f72a970e8..347b543d9 100644
--- a/form/Button.js
+++ b/form/Button.js
@@ -11,11 +11,6 @@ define([
 	"dojo/text!./templates/Button.html"
 ], function(require, declare, domClass, has, kernel, lang, ready, _FormWidget, _ButtonMixin, template){
 
-/*=====
-	var _FormWidget = dijit.form._FormWidget;
-	var _ButtonMixin = dijit.form._ButtonMixin;
-=====*/
-
 // module:
 //		dijit/form/Button
 // summary:
diff --git a/form/CheckBox.js b/form/CheckBox.js
index d3243388c..87eed28e7 100644
--- a/form/CheckBox.js
+++ b/form/CheckBox.js
@@ -11,11 +11,6 @@ define([
 	"dojo/NodeList-dom" // NodeList.addClass/removeClass
 ], function(require, declare, domAttr, has, query, ready, ToggleButton, _CheckBoxMixin, template){
 
-/*=====
-	var ToggleButton = dijit.form.ToggleButton;
-	var _CheckBoxMixin = dijit.form._CheckBoxMixin;
-=====*/
-
 	// module:
 	//		dijit/form/CheckBox
 	// summary:
diff --git a/form/ComboBox.js b/form/ComboBox.js
index d5851201b..fab6daa20 100644
--- a/form/ComboBox.js
+++ b/form/ComboBox.js
@@ -4,11 +4,6 @@ define([
 	"./ComboBoxMixin"
 ], function(declare, ValidationTextBox, ComboBoxMixin){
 
-/*=====
-	var ValidationTextBox = dijit.form.ValidationTextBox;
-	var ComboBoxMixin = dijit.form.ComboBoxMixin;
-=====*/
-
 	// module:
 	//		dijit/form/ComboBox
 	// summary:
diff --git a/form/ComboBoxMixin.js b/form/ComboBoxMixin.js
index ee4a9b889..30ff1fd81 100644
--- a/form/ComboBoxMixin.js
+++ b/form/ComboBoxMixin.js
@@ -10,11 +10,6 @@ define([
 	"dojo/text!./templates/DropDownBox.html"
 ], function(declare, Deferred, kernel, lang, QueryResults, _AutoCompleterMixin, _ComboBoxMenu, _HasDropDown, template){
 
-/*=====
-	var _AutoCompleterMixin = dijit.form._AutoCompleterMixin;
-	var _ComboBoxMenu = dijit.form._ComboBoxMenu;
-	var _HasDropDown = dijit._HasDropDown;
-=====*/
 
 	// module:
 	//		dijit/form/ComboBoxMixin
diff --git a/form/ComboButton.js b/form/ComboButton.js
index 1c2b146df..34d8d3bbc 100644
--- a/form/ComboButton.js
+++ b/form/ComboButton.js
@@ -7,10 +7,6 @@ define([
 	"dojo/text!./templates/ComboButton.html"
 ], function(declare, event, keys, focus, DropDownButton, template){
 
-/*=====
-	var DropDownButton = dijit.form.DropDownButton;
-=====*/
-
 // module:
 //		dijit/form/ComboButton
 // summary:
diff --git a/form/CurrencyTextBox.js b/form/CurrencyTextBox.js
index 5745e261a..efa21f1e0 100644
--- a/form/CurrencyTextBox.js
+++ b/form/CurrencyTextBox.js
@@ -5,10 +5,6 @@ define([
 	"./NumberTextBox"
 ], function(currency, declare, lang, NumberTextBox){
 
-/*=====
-	var NumberTextBox = dijit.form.NumberTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/CurrencyTextBox
 	// summary:
diff --git a/form/DateTextBox.js b/form/DateTextBox.js
index cd30a6719..c8c17858b 100644
--- a/form/DateTextBox.js
+++ b/form/DateTextBox.js
@@ -4,11 +4,6 @@ define([
 	"./_DateTimeTextBox"
 ], function(declare, Calendar, _DateTimeTextBox){
 
-/*=====
-	var Calendar = dijit.Calendar;
-	var _DateTimeTextBox = dijit.form._DateTimeTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/DateTextBox
 	// summary:
diff --git a/form/DropDownButton.js b/form/DropDownButton.js
index a02791ad0..bdf6ef05a 100644
--- a/form/DropDownButton.js
+++ b/form/DropDownButton.js
@@ -10,12 +10,6 @@ define([
 	"dojo/text!./templates/DropDownButton.html"
 ], function(declare, lang, query, registry, popup, Button, _Container, _HasDropDown, template){
 
-/*=====
-	Button = dijit.form.Button;
-	_Container = dijit._Container;
-	_HasDropDown = dijit._HasDropDown;
-=====*/
-
 // module:
 //		dijit/form/DropDownButton
 // summary:
diff --git a/form/FilteringSelect.js b/form/FilteringSelect.js
index 04f775142..057c25b99 100644
--- a/form/FilteringSelect.js
+++ b/form/FilteringSelect.js
@@ -7,11 +7,6 @@ define([
 	"./ComboBoxMixin"
 ], function(filter, declare, lang, when, MappedTextBox, ComboBoxMixin){
 
-/*=====
-	var MappedTextBox = dijit.form.MappedTextBox;
-	var ComboBoxMixin = dijit.form.ComboBoxMixin;
-=====*/
-
 	// module:
 	//		dijit/form/FilteringSelect
 	// summary:
diff --git a/form/Form.js b/form/Form.js
index ce1705fb0..e7e090b21 100644
--- a/form/Form.js
+++ b/form/Form.js
@@ -10,13 +10,6 @@ define([
 	"../layout/_ContentPaneResizeMixin"
 ], function(declare, domAttr, event, kernel, has, _Widget, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _FormMixin = dijit.form._FormMixin;
-	var _ContentPaneResizeMixin = dijit.layout._ContentPaneResizeMixin;
-=====*/
-
 	// module:
 	//		dijit/form/Form
 	// summary:
diff --git a/form/HorizontalRule.js b/form/HorizontalRule.js
index 6a1a391bd..ec90dbfe5 100644
--- a/form/HorizontalRule.js
+++ b/form/HorizontalRule.js
@@ -4,11 +4,6 @@ define([
 	"../_TemplatedMixin"
 ], function(declare, _Widget, _TemplatedMixin){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 // module:
 //		dijit/form/HorizontalRule
 // summary:
diff --git a/form/HorizontalRuleLabels.js b/form/HorizontalRuleLabels.js
index b5ce29a14..bc2170e8c 100644
--- a/form/HorizontalRuleLabels.js
+++ b/form/HorizontalRuleLabels.js
@@ -5,10 +5,6 @@ define([
 	"./HorizontalRule"
 ], function(declare, number, query, HorizontalRule){
 
-/*=====
-	var HorizontalRule = dijit.form.HorizontalRule;
-=====*/
-
 // module:
 //		dijit/form/HorizontalRuleLabels
 // summary:
diff --git a/form/HorizontalSlider.js b/form/HorizontalSlider.js
index 38f42d80c..3b5982bd2 100644
--- a/form/HorizontalSlider.js
+++ b/form/HorizontalSlider.js
@@ -22,12 +22,6 @@ define([
 ], function(array, declare, move, event, fx, domGeometry, domStyle, keys, lang, has, Moveable, Mover, query,
 			registry, focus, typematic, Button, _FormValueWidget, _Container, template){
 
-/*=====
-	var Button = dijit.form.Button;
-	var _FormValueWidget = dijit.form._FormValueWidget;
-	var _Container = dijit._Container;
-=====*/
-
 // module:
 //		dijit/form/HorizontalSlider
 // summary:
diff --git a/form/MappedTextBox.js b/form/MappedTextBox.js
index ea6953b11..7aa190dcb 100644
--- a/form/MappedTextBox.js
+++ b/form/MappedTextBox.js
@@ -4,10 +4,6 @@ define([
 	"./ValidationTextBox"
 ], function(declare, domConstruct, ValidationTextBox){
 
-/*=====
-	var ValidationTextBox = dijit.form.ValidationTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/MappedTextBox
 	// summary:
diff --git a/form/MultiSelect.js b/form/MultiSelect.js
index 52f28e6b5..49a975bc7 100644
--- a/form/MultiSelect.js
+++ b/form/MultiSelect.js
@@ -6,10 +6,6 @@ define([
 	"./_FormValueWidget"
 ], function(array, declare, domGeometry, query, _FormValueWidget){
 
-/*=====
-	var _FormValueWidget = dijit.form._FormValueWidget;
-=====*/
-
 // module:
 //		dijit/form/MultiSelect
 // summary:
diff --git a/form/NumberSpinner.js b/form/NumberSpinner.js
index a2bebe707..73139204f 100644
--- a/form/NumberSpinner.js
+++ b/form/NumberSpinner.js
@@ -6,11 +6,6 @@ define([
 	"./NumberTextBox"
 ], function(declare, event, keys, _Spinner, NumberTextBox){
 
-/*=====
-	var _Spinner = dijit.form._Spinner;
-	var NumberTextBox = dijit.form.NumberTextBox;
-=====*/
-
 // module:
 //		dijit/form/NumberSpinner
 // summary:
diff --git a/form/NumberTextBox.js b/form/NumberTextBox.js
index 88fc83c96..470095fbe 100644
--- a/form/NumberTextBox.js
+++ b/form/NumberTextBox.js
@@ -5,10 +5,6 @@ define([
 	"./RangeBoundTextBox"
 ], function(declare, lang, number, RangeBoundTextBox){
 
-/*=====
-	var RangeBoundTextBox = dijit.form.RangeBoundTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/NumberTextBox
 	// summary:
diff --git a/form/RadioButton.js b/form/RadioButton.js
index 71cb18501..6af50a367 100644
--- a/form/RadioButton.js
+++ b/form/RadioButton.js
@@ -4,11 +4,6 @@ define([
 	"./_RadioButtonMixin"
 ], function(declare, CheckBox, _RadioButtonMixin){
 
-/*=====
-	var CheckBox = dijit.form.CheckBox;
-	var _RadioButtonMixin = dijit.form._RadioButtonMixin;
-=====*/
-
 	// module:
 	//		dijit/form/RadioButton
 	// summary:
diff --git a/form/RangeBoundTextBox.js b/form/RangeBoundTextBox.js
index b1083821c..c73147122 100644
--- a/form/RangeBoundTextBox.js
+++ b/form/RangeBoundTextBox.js
@@ -4,10 +4,6 @@ define([
 	"./MappedTextBox"
 ], function(declare, i18n, MappedTextBox){
 
-/*=====
-	var MappedTextBox = dijit.form.MappedTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/RangeBoundTextBox
 	// summary:
diff --git a/form/Select.js b/form/Select.js
index 8a7f40e76..85a790ab2 100644
--- a/form/Select.js
+++ b/form/Select.js
@@ -18,16 +18,6 @@ define([
 ], function(array, declare, domAttr, domClass, domGeometry, event, i18n, lang,
 			_FormSelectWidget, _HasDropDown, Menu, MenuItem, MenuSeparator, Tooltip, template){
 
-/*=====
-	var _FormSelectWidget = dijit.form._FormSelectWidget;
-	var _HasDropDown = dijit._HasDropDown;
-	var _FormSelectWidget = dijit._FormSelectWidget;
-	var Menu = dijit.Menu;
-	var MenuItem = dijit.MenuItem;
-	var MenuSeparator = dijit.MenuSeparator;
-	var Tooltip = dijit.Tooltip;
-=====*/
-
 // module:
 //		dijit/form/Select
 // summary:
diff --git a/form/SimpleTextarea.js b/form/SimpleTextarea.js
index d2b62faef..26c6c6a63 100644
--- a/form/SimpleTextarea.js
+++ b/form/SimpleTextarea.js
@@ -5,10 +5,6 @@ define([
 	"./TextBox"
 ], function(declare, domClass, has, TextBox){
 
-/*=====
-	var TextBox = dijit.form.TextBox;
-=====*/
-
 // module:
 //		dijit/form/SimpleTextarea
 // summary:
diff --git a/form/TextBox.js b/form/TextBox.js
index dda11bfe3..1b14e7bb5 100644
--- a/form/TextBox.js
+++ b/form/TextBox.js
@@ -12,11 +12,6 @@ define([
 ], function(declare, domConstruct, domStyle, kernel, lang, has,
 			_FormValueWidget, _TextBoxMixin, template, dijit){
 
-/*=====
-	var _FormValueWidget = dijit.form._FormValueWidget;
-	var _TextBoxMixin = dijit.form._TextBoxMixin;
-=====*/
-
 	// module:
 	//		dijit/form/TextBox
 	// summary:
diff --git a/form/Textarea.js b/form/Textarea.js
index 6425954b4..1098e0628 100644
--- a/form/Textarea.js
+++ b/form/Textarea.js
@@ -5,11 +5,6 @@ define([
 	"./SimpleTextarea"
 ], function(declare, domStyle, _ExpandingTextAreaMixin, SimpleTextarea){
 
-/*=====
-	var _ExpandingTextAreaMixin = dijit.form._ExpandingTextAreaMixin;
-	var SimpleTextarea = dijit.form.SimpleTextarea;
-=====*/
-
 // module:
 //		dijit/form/Textarea
 // summary:
diff --git a/form/TimeTextBox.js b/form/TimeTextBox.js
index b267ca8a7..8adfd6625 100644
--- a/form/TimeTextBox.js
+++ b/form/TimeTextBox.js
@@ -6,11 +6,6 @@ define([
 	"./_DateTimeTextBox"
 ], function(declare, keys, lang, _TimePicker, _DateTimeTextBox){
 
-/*=====
-	var _TimePicker = dijit._TimePicker;
-	var _DateTimeTextBox = dijit.form._DateTimeTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/TimeTextBox
 	// summary:
diff --git a/form/ToggleButton.js b/form/ToggleButton.js
index 6cc481d18..725339f37 100644
--- a/form/ToggleButton.js
+++ b/form/ToggleButton.js
@@ -5,11 +5,6 @@ define([
 	"./_ToggleButtonMixin"
 ], function(declare, kernel, Button, _ToggleButtonMixin){
 
-/*=====
-	var Button = dijit.form.Button;
-	var _ToggleButtonMixin = dijit.form._ToggleButtonMixin;
-=====*/
-
 	// module:
 	//		dijit/form/ToggleButton
 	// summary:
diff --git a/form/ValidationTextBox.js b/form/ValidationTextBox.js
index b666e7068..0925e124a 100644
--- a/form/ValidationTextBox.js
+++ b/form/ValidationTextBox.js
@@ -8,11 +8,6 @@ define([
 	"dojo/i18n!./nls/validate"
 ], function(declare, kernel, i18n, TextBox, Tooltip, template){
 
-/*=====
-	var Tooltip = dijit.Tooltip;
-	var TextBox = dijit.form.TextBox;
-=====*/
-
 	// module:
 	//		dijit/form/ValidationTextBox
 	// summary:
diff --git a/form/VerticalRule.js b/form/VerticalRule.js
index 389dcbdde..288044452 100644
--- a/form/VerticalRule.js
+++ b/form/VerticalRule.js
@@ -3,10 +3,6 @@ define([
 	"./HorizontalRule"
 ], function(declare, HorizontalRule){
 
-/*=====
-	var HorizontalRule = dijit.form.HorizontalRule;
-=====*/
-
 	// module:
 	//		dijit/form/VerticalRule
 	// summary:
diff --git a/form/VerticalRuleLabels.js b/form/VerticalRuleLabels.js
index bcef05b64..ca1562a41 100644
--- a/form/VerticalRuleLabels.js
+++ b/form/VerticalRuleLabels.js
@@ -3,10 +3,6 @@ define([
 	"./HorizontalRuleLabels"
 ], function(declare, HorizontalRuleLabels){
 
-/*=====
-	var HorizontalRuleLabels = dijit.form.HorizontalRuleLabels;
-=====*/
-
 	// module:
 	//		dijit/form/VerticalRuleLabels
 	// summary:
diff --git a/form/VerticalSlider.js b/form/VerticalSlider.js
index f786ee954..6456368f2 100644
--- a/form/VerticalSlider.js
+++ b/form/VerticalSlider.js
@@ -4,10 +4,6 @@ define([
 	"dojo/text!./templates/VerticalSlider.html"
 ], function(declare, HorizontalSlider, template){
 
-/*=====
-	var HorizontalSlider = dijit.form.HorizontalSlider;
-=====*/
-
 	// module:
 	//		dijit/form/VerticalSlider
 	// summary:
diff --git a/form/_ComboBoxMenu.js b/form/_ComboBoxMenu.js
index 2c1abf1a8..c4be323bf 100644
--- a/form/_ComboBoxMenu.js
+++ b/form/_ComboBoxMenu.js
@@ -10,12 +10,6 @@ define([
 ], function(declare, domClass, domStyle, keys,
 			_WidgetBase, _TemplatedMixin, _ComboBoxMenuMixin, _ListMouseMixin){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _ComboBoxMenuMixin = dijit.form._ComboBoxMenuMixin;
-	var _ListMouseMixin = dijit.form._ListMouseMixin;
-=====*/
 
 	// module:
 	//		dijit/form/_ComboBoxMenu
diff --git a/form/_DateTimeTextBox.js b/form/_DateTimeTextBox.js
index de47cda6b..315db5b2e 100644
--- a/form/_DateTimeTextBox.js
+++ b/form/_DateTimeTextBox.js
@@ -9,11 +9,6 @@ define([
 	"dojo/text!./templates/DropDownBox.html"
 ], function(date, locale, stamp, declare, lang, RangeBoundTextBox, _HasDropDown, template){
 
-/*=====
-	var _HasDropDown = dijit._HasDropDown;
-	var RangeBoundTextBox = dijit.form.RangeBoundTextBox;
-=====*/
-
 	// module:
 	//		dijit/form/_DateTimeTextBox
 	// summary:
diff --git a/form/_FormSelectWidget.js b/form/_FormSelectWidget.js
index 30f1a66c4..fbaa3dc51 100644
--- a/form/_FormSelectWidget.js
+++ b/form/_FormSelectWidget.js
@@ -15,10 +15,6 @@ define([
 ], function(array, Deferred, aspect, sorter, declare, dom, domClass, kernel, lang, query, when,
 			QueryResults, _FormValueWidget){
 
-/*=====
-	var _FormValueWidget = dijit.form._FormValueWidget;
-=====*/
-
 // module:
 //		dijit/form/_FormSelectWidget
 // summary:
diff --git a/form/_FormValueMixin.js b/form/_FormValueMixin.js
index 582271ab0..964b8f181 100644
--- a/form/_FormValueMixin.js
+++ b/form/_FormValueMixin.js
@@ -6,10 +6,6 @@ define([
 	"./_FormWidgetMixin"
 ], function(declare, domAttr, keys, has, _FormWidgetMixin){
 
-/*=====
-	var _FormWidgetMixin = dijit.form._FormWidgetMixin;
-=====*/
-
 	// module:
 	//		dijit/form/_FormValueMixin
 	// summary:
diff --git a/form/_FormValueWidget.js b/form/_FormValueWidget.js
index 6af51a35f..0cf61227b 100644
--- a/form/_FormValueWidget.js
+++ b/form/_FormValueWidget.js
@@ -5,11 +5,6 @@ define([
 	"./_FormValueMixin"
 ], function(declare, has, _FormWidget, _FormValueMixin){
 
-/*=====
-var _FormWidget = dijit.form._FormWidget;
-var _FormValueMixin = dijit.form._FormValueMixin;
-=====*/
-
 // module:
 //		dijit/form/_FormValueWidget
 // summary:
diff --git a/form/_FormWidget.js b/form/_FormWidget.js
index 140a8bc4f..eb67cc53e 100644
--- a/form/_FormWidget.js
+++ b/form/_FormWidget.js
@@ -9,12 +9,6 @@ define([
 	"./_FormWidgetMixin"
 ], function(declare, has, kernel, ready, _Widget, _CssStateMixin, _TemplatedMixin, _FormWidgetMixin){
 
-/*=====
-var _Widget = dijit._Widget;
-var _TemplatedMixin = dijit._TemplatedMixin;
-var _CssStateMixin = dijit._CssStateMixin;
-var _FormWidgetMixin = dijit.form._FormWidgetMixin;
-=====*/
 
 // module:
 //		dijit/form/_FormWidget
diff --git a/form/_ListMouseMixin.js b/form/_ListMouseMixin.js
index 2f06c5491..688673831 100644
--- a/form/_ListMouseMixin.js
+++ b/form/_ListMouseMixin.js
@@ -5,10 +5,6 @@ define([
 	"./_ListBase"
 ], function(declare, event, touch, _ListBase){
 
-/*=====
-var _ListBase = dijit.form._ListBase;
-=====*/
-
 // module:
 //		dijit/form/_ListMouseMixin
 // summary:
diff --git a/form/_Spinner.js b/form/_Spinner.js
index a8f65519b..8f74ff9e1 100644
--- a/form/_Spinner.js
+++ b/form/_Spinner.js
@@ -10,9 +10,6 @@ define([
 	"./_TextBoxMixin"	// selectInputText
 ], function(declare, event, keys, lang, has, typematic, RangeBoundTextBox, template, _TextBoxMixin){
 
-/*=====
-	var RangeBoundTextBox = dijit.form.RangeBoundTextBox;
-=====*/
 
 	// module:
 	//		dijit/form/_Spinner
diff --git a/layout/AccordionContainer.js b/layout/AccordionContainer.js
index 094ef4a1d..d7aee35c9 100644
--- a/layout/AccordionContainer.js
+++ b/layout/AccordionContainer.js
@@ -27,15 +27,6 @@ define([
 			keys, lang, has, topic, focus, manager, ready,
 			_Widget, _Container, _TemplatedMixin, _CssStateMixin, StackContainer, ContentPane, template){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _Container = dijit._Container;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _CssStateMixin = dijit._CssStateMixin;
-	var StackContainer = dijit.layout.StackContainer;
-	var ContentPane = dijit.layout.ContentPane;
-=====*/
-
 	// module:
 	//		dijit/layout/AccordionContainer
 	// summary:
diff --git a/layout/AccordionPane.js b/layout/AccordionPane.js
index 906824239..99c123bfc 100644
--- a/layout/AccordionPane.js
+++ b/layout/AccordionPane.js
@@ -4,10 +4,6 @@ define([
 	"./ContentPane"
 ], function(declare, kernel, ContentPane){
 
-/*=====
-	var ContentPane = dijit.layout.ContentPane;
-=====*/
-
 	// module:
 	//		dijit/layout/AccordionPane
 	// summary:
diff --git a/layout/BorderContainer.js b/layout/BorderContainer.js
index c6a2d1e08..5d88817eb 100644
--- a/layout/BorderContainer.js
+++ b/layout/BorderContainer.js
@@ -19,13 +19,6 @@ define([
 ], function(array, cookie, declare, domClass, domConstruct, domGeometry, domStyle, event, keys, lang, on, touch,
 			_WidgetBase, _Widget, _TemplatedMixin, _LayoutWidget, layoutUtils){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _LayoutWidget = dijit.layout._LayoutWidget;
-=====*/
-
 // module:
 //		dijit/layout/BorderContainer
 // summary:
diff --git a/layout/ContentPane.js b/layout/ContentPane.js
index 6ed3c9004..c05825cce 100644
--- a/layout/ContentPane.js
+++ b/layout/ContentPane.js
@@ -18,11 +18,6 @@ define([
 ], function(kernel, lang, _Widget, _Container, _ContentPaneResizeMixin, string, html, nlsLoading,
 	array, declare, Deferred, dom, domAttr, xhr, i18n, when){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _ContentPaneResizeMixin = dijit.layout._ContentPaneResizeMixin;
-=====*/
-
 // module:
 //		dijit/layout/ContentPane
 // summary:
diff --git a/layout/LayoutContainer.js b/layout/LayoutContainer.js
index 3cc2d8af4..6cd3f31dc 100644
--- a/layout/LayoutContainer.js
+++ b/layout/LayoutContainer.js
@@ -7,11 +7,6 @@ define([
 	"./utils"		// layoutUtils.layoutChildren
 ], function(kernel, lang, declare, _WidgetBase, _LayoutWidget, layoutUtils){
 
-/*=====
-	var _WidgetBase = dijit._WidgetBase;
-	var _LayoutWidget = dijit.layout._LayoutWidget;
-=====*/
-
 // module:
 //		dijit/layout/LayoutContainer
 // summary:
diff --git a/layout/LinkPane.js b/layout/LinkPane.js
index 5010de68a..5fc893231 100644
--- a/layout/LinkPane.js
+++ b/layout/LinkPane.js
@@ -4,11 +4,6 @@ define([
 	"dojo/_base/declare" // declare
 ], function(ContentPane, _TemplatedMixin, declare){
 
-/*=====
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var ContentPane = dijit.layout.ContentPane;
-=====*/
-
 	// module:
 	//		dijit/layout/LinkPane
 	// summary:
diff --git a/layout/ScrollingTabController.js b/layout/ScrollingTabController.js
index 7194e5680..845799c2f 100644
--- a/layout/ScrollingTabController.js
+++ b/layout/ScrollingTabController.js
@@ -24,14 +24,6 @@ define([
 	registry, tabControllerTemplate, buttonTemplate, TabController, layoutUtils, _WidgetsInTemplateMixin,
 	Menu, MenuItem, Button, _HasDropDown){
 
-/*=====
-var _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
-var Menu = dijit.Menu;
-var _HasDropDown = dijit._HasDropDown;
-var TabController = dijit.layout.TabController;
-=====*/
-
-
 // module:
 //		dijit/layout/ScrollingTabController
 // summary:
@@ -445,9 +437,6 @@ var ScrollingTabControllerButtonMixin = declare("dijit.layout._ScrollingTabContr
 	// either (this override avoids focus() call in FormWidget.js)
 	isFocusable: function(){ return false; }
 });
-/*=====
-ScrollingTabControllerButtonMixin = dijit.layout._ScrollingTabControllerButtonMixin;
-=====*/
 
 // Class used in template
 declare("dijit.layout._ScrollingTabControllerButton",
diff --git a/layout/SplitContainer.js b/layout/SplitContainer.js
index 8dc4c0bad..9dddf9598 100644
--- a/layout/SplitContainer.js
+++ b/layout/SplitContainer.js
@@ -18,11 +18,6 @@ define([
 ], function(array, cookie, declare, dom, domClass, domConstruct, domGeometry, domStyle,
 			event, kernel, lang, on, has, registry, _WidgetBase, _LayoutWidget){
 
-/*=====
-var _WidgetBase = dijit._WidgetBase;
-var _LayoutWidget = dijit.layout._LayoutWidget;
-=====*/
-
 // module:
 //		dijit/layout/SplitContainer
 // summary:
diff --git a/layout/StackContainer.js b/layout/StackContainer.js
index cb2ed6edd..07258ec9f 100644
--- a/layout/StackContainer.js
+++ b/layout/StackContainer.js
@@ -14,12 +14,6 @@ define([
 ], function(array, cookie, declare, domClass, has, lang, ready, topic,
 			registry, _WidgetBase, _LayoutWidget){
 
-/*=====
-var _WidgetBase = dijit._WidgetBase;
-var _LayoutWidget = dijit.layout._LayoutWidget;
-var StackController = dijit.layout.StackController;
-=====*/
-
 // module:
 //		dijit/layout/StackContainer
 // summary:
diff --git a/layout/StackController.js b/layout/StackController.js
index 1d00b0da0..d097b0bfc 100644
--- a/layout/StackController.js
+++ b/layout/StackController.js
@@ -16,13 +16,6 @@ define([
 ], function(array, declare, domClass, event, keys, lang, on,
 			focus, registry, _Widget, _TemplatedMixin, _Container, ToggleButton){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-	var _Container = dijit._Container;
-	var ToggleButton = dijit.form.ToggleButton;
-=====*/
-
 	// module:
 	//		dijit/layout/StackController
 	// summary:
diff --git a/layout/TabContainer.js b/layout/TabContainer.js
index 4d04fd139..3e00fb906 100644
--- a/layout/TabContainer.js
+++ b/layout/TabContainer.js
@@ -6,12 +6,6 @@ define([
 	"./ScrollingTabController"
 ], function(lang, declare, _TabContainerBase, TabController, ScrollingTabController){
 
-/*=====
-	var _TabContainerBase = dijit.layout._TabContainerBase;
-	var TabController = dijit.layout.TabController;
-	var ScrollingTabController = dijit.layout.ScrollingTabController;
-=====*/
-
 	// module:
 	//		dijit/layout/TabContainer
 	// summary:
diff --git a/layout/TabController.js b/layout/TabController.js
index 95f0bd986..191df5365 100644
--- a/layout/TabController.js
+++ b/layout/TabController.js
@@ -13,10 +13,6 @@ define([
 	"dojo/i18n!../nls/common"
 ], function(declare, dom, domAttr, domClass, i18n, lang, StackController, registry, Menu, MenuItem, template){
 
-/*=====
-	var StackController = dijit.layout.StackController;
-=====*/
-
 	// module:
 	//		dijit/layout/TabController
 	// summary:
diff --git a/layout/_LayoutWidget.js b/layout/_LayoutWidget.js
index d8560e1b9..bb28ac386 100644
--- a/layout/_LayoutWidget.js
+++ b/layout/_LayoutWidget.js
@@ -11,12 +11,6 @@ define([
 ], function(lang, _Widget, _Container, _Contained, Viewport,
 	declare, domClass, domGeometry, domStyle){
 
-/*=====
-	var _Widget = dijit._Widget;
-	var _Container = dijit._Container;
-	var _Contained = dijit._Contained;
-=====*/
-
 	// module:
 	//		dijit/layout/_LayoutWidget
 	// summary:
diff --git a/layout/_TabContainerBase.js b/layout/_TabContainerBase.js
index 5796d7457..1d745588b 100644
--- a/layout/_TabContainerBase.js
+++ b/layout/_TabContainerBase.js
@@ -9,12 +9,6 @@ define([
 	"dojo/dom-style" // domStyle.style
 ], function(template, StackContainer, layoutUtils, _TemplatedMixin, declare, domClass, domGeometry, domStyle){
 
-
-/*=====
-	var StackContainer = dijit.layout.StackContainer;
-	var _TemplatedMixin = dijit._TemplatedMixin;
-=====*/
-
 // module:
 //		dijit/layout/_TabContainerBase
 // summary:
diff --git a/tree/ForestStoreModel.js b/tree/ForestStoreModel.js
index 21eaa5e61..9a7ec1a93 100644
--- a/tree/ForestStoreModel.js
+++ b/tree/ForestStoreModel.js
@@ -6,10 +6,6 @@ define([
 	"./TreeStoreModel"
 ], function(array, declare, kernel, lang, TreeStoreModel){
 
-/*=====
-var TreeStoreModel = dijit.tree.TreeStoreModel;
-=====*/
-
 // module:
 //		dijit/tree/ForestStoreModel
 // summary: