As everybody says, there are no shortcuts, I did a complete check a couple of days ago and after printing out a circuit diagram, discovered that I had 3 extra relays! It appears that they were for a 'dee-daa dee- daa' 2 tone horn, flashing blue lights and something else I am not too sure about. Ergo, my boxer is an ex european POLICE machine!
Anyway, after removing the extra relays and about 2 kg. of unconnected and useless wiring, I went through the entire system, using up 2 cans of contact cleaner, a couple of grams of solder, a few meterrs of heat-shrink insulation etc. Apart from the amputation of the extra relays, the entire process took about 10 hrs. Since I am in the corrosive tropics, I also used dielectric grease on every switch, contact etc. Good for another year I think!