I was just there doing the wiper switch and yes disconnect the battery and remove the cluster. My car is a 4 speed GT so the rally pack, two bolts, and wire guard, 1 screw, come off and set on the floor. Jack up the car unclip the speedo cable from the passenger side floor pan, behind the H-Pipe, and shove some of the slack 2-3 inches, toward the cluster. You may need to pull the slack up from inside the car, behind and above, the gas peddle. Now your ready to go after the cluster, 6 screws, remove the screws and tilt the cluster to separate from the metal dash . Reach in and undo the speedo cable. I usually leave everything, gauges and dash lights, connected and just move the cluster to one side. Much easier to get to the switch from above. Brian