remove a few casts