Merge "Fixes removing inventory keys"