MAJOR CHANGE: AddressBook removed