Partially removed the cash system. Untested.