Changed return types to work with the new api change in ucam-ldap.  Removed a load of wasted lines.