User delete fixes

Reworking user deleting so that we don't redundantly search for directories, we just lock on the user's email and we avoid querying N times for N study consents. Also, we are retrieving the user's health code, which we were not doing, so that the user's records are properly deleted. This does not appear to have been working.
Put the retry back.