Removed test code
Reduce LDAP fetch to single query