Yep, that's the goal of the latest "going in". Now the AC switch is bundled in with the low signal wiring going to the light board, I'm thinking of a way to keep those outta there and short of installing the On/Off switch last and first everytime you take the faceplate off, a harness plug of some sort.
Pics, caps out, BR and buss bar out, fuse holder out, wire unbundled. And that mess under the right output rail.
It will get a new 35 amp BR, properly bypassed, a new BABB( Bad Ass Bus Bar) and god knows what else.