Clean Up SAML and LDAP References

There are various places in the code from the early days that reference pulling attributes directly from LDAP (CO-36) or SAML (CO-46), but pretty clearly this won't happen, so clean this up.