Revert "EconomyS"

This reverts commit 838812b3c16d1da589e3a89bf8e222b46e25afa2.