Revert "Added Marcell's shop code for merge" since it broke everything.

This reverts commit 28ae45b5e911fde70f55196e479b3f95f02318f0.