Fix for deals_with_commodities + cleanup.