more pci cleanups