Merge "Remove dead code in Switch"