Remove more cast declarations