removed raw and values()