reduce raw types

Why is this needed?