SOAP-2335 Anonymized user ID + some cleanup