Addressbook - Remove unneeded code