Cleanup
Renamed BuildCredentials