Moved inventory utils back to PCC from MFR
Refactoring for inventory utils