Remove additional casts