Clean up federated identity audit code

Change-Id: I110eb40c83f1de25bff9215b0490269f5941316a
Merge "Clean up federated identity audit code"