Merge "Cleanup: Removed unused inventory-config model."