Cleanup

Feel free to review but it relies on the `otp-ldap` update, so merge that one first and then I'll rebase.