LDAP query classes cleanup