John - since the battery is disconnected now, if you have access to an ammeter you could check the "key-off" battery drain - should only be about 10-20mA (more if you have the optional clock or a radio with presets fitted). If it's more like 100-500mA and the clicking noise returns when the meter is 'in-circuit', suspect a relay or fuel pump
