removed unneeded pods, added address book wrapper