diff --git a/media/src/DataTables.js b/media/src/DataTables.js
index f5de7dd7..dbb57da5 100644
--- a/media/src/DataTables.js
+++ b/media/src/DataTables.js
@@ -21,7 +21,7 @@
  */
 
 /*jslint evil: true, undef: true, browser: true */
-/*globals $,require,jQuery,define,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnApplyColumnDefs,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnNodeToColumnIndex,_fnInfoMacros,_fnBrowserDetect,_fnGetColumns,_fnHungarianMap,_fnCamelToHungarian,_fnBuildAjax,_fnAjaxDataSrc*/
+/*globals $,require,jQuery,define,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnEscapeRegex,_fnDeleteIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnApplyColumnDefs,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnNodeToColumnIndex,_fnInfoMacros,_fnBrowserDetect,_fnGetColumns,_fnHungarianMap,_fnCamelToHungarian,_fnBuildAjax,_fnAjaxDataSrc*/
 
 (/** @lends <global> */function( window, document, undefined ) {
 
diff --git a/media/src/api/api.internal.js b/media/src/api/api.internal.js
index 5201063d..8f57bb55 100644
--- a/media/src/api/api.internal.js
+++ b/media/src/api/api.internal.js
@@ -82,7 +82,6 @@ this.oApi = {
 	"_fnSettingsFromNode": _fnSettingsFromNode,
 	"_fnGetDataMaster": _fnGetDataMaster,
 	"_fnGetTrNodes": _fnGetTrNodes,
-	"_fnGetTdNodes": _fnGetTdNodes,
 	"_fnEscapeRegex": _fnEscapeRegex,
 	"_fnDeleteIndex": _fnDeleteIndex,
 	"_fnColumnOrdering": _fnColumnOrdering,
diff --git a/media/src/core/core.data.js b/media/src/core/core.data.js
index e0eaf086..d56abc9d 100644
--- a/media/src/core/core.data.js
+++ b/media/src/core/core.data.js
@@ -126,16 +126,7 @@ function _fnNodeToDataIndex( oSettings, n )
  */
 function _fnNodeToColumnIndex( oSettings, iRow, n )
 {
-	var anCells = _fnGetTdNodes( oSettings, iRow );
-
-	for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-	{
-		if ( anCells[i] === n )
-		{
-			return i;
-		}
-	}
-	return -1;
+	return $.inArray( n, oSettings.aoData[ iRow ].anCells );
 }
 
 
diff --git a/media/src/core/core.draw.js b/media/src/core/core.draw.js
index 8c3755da..a2162089 100644
--- a/media/src/core/core.draw.js
+++ b/media/src/core/core.draw.js
@@ -13,6 +13,7 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 	var
 		row = oSettings.aoData[iRow],
 		rowData = row._aData,
+		cells = [],
 		nTr, nTd, oCol,
 		i, iLen;
 
@@ -42,6 +43,7 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 			oCol = oSettings.aoColumns[i];
 
 			nTd = nTrIn ? anTds[i] : document.createElement( oCol.sCellType );
+			cells.push( nTd );
 
 			// Need to create the HTML if new, or if a rendering function is defined
 			if ( !nTrIn || oCol.mRender || oCol.mData !== i )
@@ -56,7 +58,6 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 			}
 
 			// Visibility - add or remove as required
-			row._anHidden[i] = oCol.bVisible ? null : nTd;
 			if ( oCol.bVisible && ! nTrIn )
 			{
 				nTr.appendChild( nTd );
@@ -75,6 +76,7 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 		}
 
 		row.nTr = nTr;
+		row.anCells = cells;
 
 		_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] );
 	}
diff --git a/media/src/core/core.sizing.js b/media/src/core/core.sizing.js
index d5f5feb4..4566d828 100644
--- a/media/src/core/core.sizing.js
+++ b/media/src/core/core.sizing.js
@@ -301,16 +301,15 @@ function _fnGetWidestNode( oSettings, iCol )
 		return null;
 	}
 
-	if ( oSettings.aoData[iMaxIndex].nTr === null )
-	{
-		var n = document.createElement('td');
-		n.innerHTML = _fnGetCellData( oSettings, iMaxIndex, iCol, '' );
-		return n;
-	}
-	return _fnGetTdNodes(oSettings, iMaxIndex)[iCol];
+	var data = oSettings.aoData[ iMaxIndex ];
+	return data.nTr === null ? // Might not have been created when deferred rendering
+		$('<td/>').html( _fnGetCellData( oSettings, iMaxIndex, iCol, 'display' ) )[0] :
+		data.anCells[ iCol ];
 }
 
 
+var __re_html_remove = /<.*?>/g;
+
 /**
  * Get the maximum strlen for each data column
  *  @param {object} oSettings dataTables settings object
@@ -320,13 +319,13 @@ function _fnGetWidestNode( oSettings, iCol )
  */
 function _fnGetMaxLenString( oSettings, iCol )
 {
-	var iMax = -1;
-	var iMaxIndex = -1;
+	var s, iMax=-1, iMaxIndex = -1;
 	
 	for ( var i=0 ; i<oSettings.aoData.length ; i++ )
 	{
-		var s = _fnGetCellData( oSettings, i, iCol, 'display' )+"";
-		s = s.replace( /<.*?>/g, "" );
+		s = _fnGetCellData( oSettings, i, iCol, 'display' )+'';
+		s = s.replace( __re_html_remove, '' );
+
 		if ( s.length > iMax )
 		{
 			iMax = s.length;
diff --git a/media/src/core/core.sort.js b/media/src/core/core.sort.js
index 61825926..d913723b 100644
--- a/media/src/core/core.sort.js
+++ b/media/src/core/core.sort.js
@@ -434,6 +434,13 @@ function _fnSortingClasses( oSettings )
 			$(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
 		}
 	}
+
+	// @todo This is totally inefficient. It is accessing the class name of every
+	// cell when it really doesn't need to. It should determine which cells
+	// have classes to be removed (by saving the previous state or doing a check
+	// on the first row), and then add to the required cells. Use _pluck.
+	// DISABLED until this can be done, since _fnGetTdNodes has been removed.
+	return;
 	
 	/*
 	 * Apply the required classes to the table body
diff --git a/media/src/core/core.support.js b/media/src/core/core.support.js
index cdcb7d26..fa707944 100644
--- a/media/src/core/core.support.js
+++ b/media/src/core/core.support.js
@@ -40,67 +40,6 @@ function _fnGetTrNodes ( oSettings )
 }
 
 
-/**
- * Return an flat array with all TD nodes for the table, or row
- *  @param {object} oSettings dataTables settings object
- *  @param {int} [iIndividualRow] aoData index to get the nodes for - optional
- *    if not given then the return array will contain all nodes for the table
- *  @returns {array} TD array
- *  @memberof DataTable#oApi
- */
-function _fnGetTdNodes ( oSettings, iIndividualRow )
-{
-	var anReturn = [];
-	var iCorrector;
-	var anTds, nTd;
-	var iRow, iRows=oSettings.aoData.length,
-		iColumn, iColumns, oData, sNodeName, iStart=0, iEnd=iRows;
-	
-	/* Allow the collection to be limited to just one row */
-	if ( iIndividualRow !== undefined )
-	{
-		iStart = iIndividualRow;
-		iEnd = iIndividualRow+1;
-	}
-
-	for ( iRow=iStart ; iRow<iEnd ; iRow++ )
-	{
-		oData = oSettings.aoData[iRow];
-		if ( oData.nTr !== null )
-		{
-			/* get the TD child nodes - taking into account text etc nodes */
-			anTds = [];
-			nTd = oData.nTr.firstChild;
-			while ( nTd )
-			{
-				sNodeName = nTd.nodeName.toLowerCase();
-				if ( sNodeName == 'td' || sNodeName == 'th' )
-				{
-					anTds.push( nTd );
-				}
-				nTd = nTd.nextSibling;
-			}
-
-			iCorrector = 0;
-			for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
-			{
-				if ( oSettings.aoColumns[iColumn].bVisible )
-				{
-					anReturn.push( anTds[iColumn-iCorrector] );
-				}
-				else
-				{
-					anReturn.push( oData._anHidden[iColumn] );
-					iCorrector++;
-				}
-			}
-		}
-	}
-
-	return anReturn;
-}
-
-
 /**
  * Log an error message
  *  @param {object} oSettings dataTables settings object
diff --git a/media/src/model/model.row.js b/media/src/model/model.row.js
index d5097e83..a4f1f99c 100644
--- a/media/src/model/model.row.js
+++ b/media/src/model/model.row.js
@@ -15,6 +15,14 @@ DataTable.models.oRow = {
 	 */
 	"nTr": null,
 
+	/**
+	 * Array of TD elements for each row. This is null until the row has been
+	 * created.
+	 *  @type array nodes
+	 *  @default []
+	 */
+	"anCells": null,
+
 	/**
 	 * Data object from the original data source for the row. This is either
 	 * an array if using the traditional form of DataTables, or an object if
@@ -40,18 +48,6 @@ DataTable.models.oRow = {
 	 */
 	"_aSortData": [],
 
-	/**
-	 * Array of TD elements that are cached for hidden rows, so they can be
-	 * reinserted into the table if a column is made visible again (or to act
-	 * as a store if a column is made hidden). Only hidden columns have a
-	 * reference in the array. For non-hidden columns the value is either
-	 * undefined or null.
-	 *  @type array nodes
-	 *  @default []
-	 *  @private
-	 */
-	"_anHidden": [],
-
 	/**
 	 * Cache of the class name that DataTables has applied to the row, so we
 	 * can quickly look at this variable rather than needing to do a DOM check