Remove casting
Remove casting