Removed hot-fix for inventory, made surplus function work again