Removed dependency on ldap