Bit like tugging at a loose thread.  Started out by deleting the 
deprecated function with the smallest count only I found that all the 
attached broke off!

I'll commit in a few days once the rebuilding has finished.

Andrew