Split up Switch, other cleaning.