More radical simplification