Remove incorrect reordering block
Add tripswitch to single mode handling