Raw types removed