More simplification.