Clean up code with updates made to branded_theme_base