Completed the cleanup. Also added plone.app.ldap as dependency.