remove Ini, add Ldap & Imap, corrections from @ircmaxell, cleanup