more simplifications for release