CSIT-106 Cleanup of add_pci functions