Cleanup inventory utils weirdness