Removed type casts that's not needed