You have it down exactly, all you need to keep is the wiper wires. Heres a pic I just took of my daily driver, all I have is the wiper motor wires, and a wire for my amp coming out the firewall. As for the fuse block thats mounted to the inner fender I moved it in front of the battery tray.