removing more casts!