Delete some more useless casts