Test clean up. Standardise delete contact calls.

Test clean up. Standardise delete contact calls.

There are 2 different methods in play for deleting contacts in tests. The one I'm removing uses a non-standard path & sometimes
causes loading issues when run in isolation, as well as being the less used.

Other functions could do with the same treatment.

Some unused vars removed too