Clean up more raw types