Update iOS plus cleanup