[skov]

That's far too methodical
I just ripped all the wiring out and figured I'd worry about it at a later date.
I suspect your approach will pay dividends later whilst I'm up to my eyeballs in tangled cables and impossible to understand wiring diagrams!