Index: t3lib/config_default.php
===================================================================
--- t3lib/config_default.php	(revision 10380)
+++ t3lib/config_default.php	(working copy)
@@ -928,7 +928,6 @@
 	// Those which are/can be set in "stddb/tables.php" files:
 unset($PAGES_TYPES);
 unset($ICON_TYPES);
-unset($LANG_GENERAL_LABELS);
 unset($TCA);
 unset($TBE_MODULES);
 unset($TBE_STYLES);
Index: t3lib/stddb/tables.php
===================================================================
--- t3lib/stddb/tables.php	(revision 10380)
+++ t3lib/stddb/tables.php	(working copy)
@@ -27,7 +27,7 @@
 /**
  * Contains the initialization of global TYPO3 variables among which $TCA is the most significant.
  *
- * The list in order of apperance is: $PAGES_TYPES, $ICON_TYPES, $LANG_GENERAL_LABELS, $TCA, $TBE_MODULES, $TBE_STYLES, $FILEICONS
+ * The list in order of apperance is: $PAGES_TYPES, $ICON_TYPES, $TCA, $TBE_MODULES, $TBE_STYLES, $FILEICONS
  * These variables are first of all used in the backend but to some degree in the frontend as well. (See references)
  * See the document "Inside TYPO3" for a description of each variable in addition to the comment associated with each.
  *
@@ -99,23 +99,6 @@
 
 
 /**
- * Commonly used language labels which can be used in the $TCA array and elsewhere.
- * Obsolete - just use the values of each entry directly.
- * @todo turn into an object with magic getters and setter so we can make use of the deprecation logging
- * @deprecated since TYPO3 3.6
- */
-$LANG_GENERAL_LABELS = array(
-	'endtime' => 'LLL:EXT:lang/locallang_general.php:LGL.endtime',
-	'hidden' => 'LLL:EXT:lang/locallang_general.php:LGL.hidden',
-	'starttime' => 'LLL:EXT:lang/locallang_general.php:LGL.starttime',
-	'fe_group' => 'LLL:EXT:lang/locallang_general.php:LGL.fe_group',
-	'hide_at_login' => 'LLL:EXT:lang/locallang_general.php:LGL.hide_at_login',
-	'any_login' => 'LLL:EXT:lang/locallang_general.php:LGL.any_login',
-	'usergroups' => 'LLL:EXT:lang/locallang_general.php:LGL.usergroups',
-);
-
-
-/**
  * $TCA:
  * This array configures TYPO3 to work with the tables from the database by assigning meta information about data types, relations etc.
  * The global variable $TCA will contain the information needed to recognize and render each table in the backend
Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php	(revision 10380)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php	(working copy)
@@ -2247,7 +2247,7 @@
 	 * @see getCompressedTCarray()
 	 */
 	function includeTCA($TCAloaded=1)	{
-		global $TCA, $PAGES_TYPES, $LANG_GENERAL_LABELS, $TBE_MODULES;
+		global $TCA, $PAGES_TYPES, $TBE_MODULES;
 		if (!$this->TCAloaded)	{
 			$TCA = Array();
 			include (TYPO3_tables_script ? PATH_typo3conf.TYPO3_tables_script : PATH_t3lib.'stddb/tables.php');