reduce raw types

rm