Cleanup ldap

Please pull #76 first