Revert "Shop and camp changes"

This reverts commit fbd44d8b7348e4eccf8f53479b00cda9ee0c59c2.