Remove traditional type-casting