Remove static casts