Revert "More updates of the ongoing shop integration"

This reverts commit c68659142478761006b43dfe424c6ab02185c3fe.