1. Clean up code due to changes in SwitchTo*Section(2)