Revert "Toy and merch computer enhancements"

This reverts commit ca1ffeb3900e8b5b92932611bb2a728c7d68e8bb.