More simplificiations.