From 23c582d01d86a00a8d987154cd2ee42434afc446 Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzo@renzolucioni.com>
Date: Tue, 15 Dec 2015 14:38:29 -0500
Subject: [PATCH] Delete dead SUBDOMAIN_BRANDING setting.

---
 cms/envs/aws.py     |  1 -
 lms/envs/aws.py     |  1 -
 lms/envs/cms/dev.py |  2 --
 lms/envs/common.py  |  6 ------
 lms/envs/dev.py     | 11 -----------
 5 files changed, 21 deletions(-)

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index bdb670eb66..9f4ab6aba9 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -306,7 +306,6 @@ EVENT_TRACKING_BACKENDS['tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKE
 EVENT_TRACKING_BACKENDS['segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend(
     AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", []))
 
-SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
 VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
 
 ##### ACCOUNT LOCKOUT DEFAULT PARAMETERS #####
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 38d61de346..868fbd9251 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -270,7 +270,6 @@ LOGGING = get_logger_config(LOG_DIR,
                             service_variant=SERVICE_VARIANT)
 
 COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {})
-SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
 VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
 META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
 COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index 0669147d0f..275ff8fdeb 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -10,8 +10,6 @@ from ..dev import *
 
 FEATURES['AUTH_USE_CERTIFICATES'] = False
 
-SUBDOMAIN_BRANDING['edge'] = 'edge'
-SUBDOMAIN_BRANDING['preview.edge'] = 'edge'
 VIRTUAL_UNIVERSITIES = ['edge']
 
 # Turn off this flag because it will render 'Edit / QA' links for all instructor viewings of
diff --git a/lms/envs/common.py b/lms/envs/common.py
index da1c224e66..c3a4b23e53 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -73,11 +73,6 @@ FEATURES = {
     ## Doing so will cause all courses to be released on production
     'DISABLE_START_DATES': False,  # When True, all courses will be active, regardless of start date
 
-    # When True, will override certain branding with university specific values
-    # Expects a SUBDOMAIN_BRANDING dictionary that maps the subdomain to the
-    # university to use for branding purposes
-    'SUBDOMAIN_BRANDING': False,
-
     # for consistency in user-experience, keep the value of the following 3 settings
     # in sync with the corresponding ones in cms/envs/common.py
     'ENABLE_DISCUSSION_SERVICE': True,
@@ -674,7 +669,6 @@ OPTIMIZELY_PROJECT_ID = None
 
 ######################## subdomain specific settings ###########################
 COURSE_LISTINGS = {}
-SUBDOMAIN_BRANDING = {}
 VIRTUAL_UNIVERSITIES = []
 
 ############# XBlock Configuration ##########
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 9ac93a1de0..5fb2e93e9e 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -20,7 +20,6 @@ TEMPLATE_DEBUG = True
 HTTPS = 'off'
 FEATURES['DISABLE_START_DATES'] = False
 FEATURES['ENABLE_SQL_TRACKING_LOGS'] = True
-FEATURES['SUBDOMAIN_BRANDING'] = True
 FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
 FEATURES['ENABLE_SERVICE_STATUS'] = True
 FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True     # Enable email for all Studio courses
@@ -128,16 +127,6 @@ COURSE_LISTINGS = {
     'sjsu': ['MITx/6.002x-EE98/2012_Fall_SJSU'],
 }
 
-
-SUBDOMAIN_BRANDING = {
-    'sjsu': 'MITx',
-    'mit': 'MITx',
-    'berkeley': 'BerkeleyX',
-    'harvard': 'HarvardX',
-    'openedx': 'openedx',
-    'edge': 'edge',
-}
-
 # List of `university` landing pages to display, even though they may not
 # have an actual course with that org set
 VIRTUAL_UNIVERSITIES = []