Remove $s and remove mention of building SUI