Clean up leftover bogus casts