More cleanup + Removed the setup profile implicit dependency on p.a.ldap (explicit is better than implicit)