more simplifications.