Cleanup switch.S. Simplify frame structures used in system.