removed some leftover casts