Revert "Tweaking inventory system"

This reverts commit b666cbf3f53df330d6497df4d958ca268295253a.